From 806253f31f663594c70e10862f0743530a75e094 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 13 Jan 2020 12:28:05 +0100 Subject: DSA: Move DSA_security_bits() and DSA_bits() ... to make them accessible from the FIPS provider module. Reviewed-by: Nicola Tuveri (Merged from https://github.com/openssl/openssl/pull/10778) --- crypto/dsa/dsa_lib.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'crypto/dsa/dsa_lib.c') diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c index 10e88c16bf..976eb622aa 100644 --- a/crypto/dsa/dsa_lib.c +++ b/crypto/dsa/dsa_lib.c @@ -29,13 +29,6 @@ void *DSA_get_ex_data(DSA *d, int idx) return CRYPTO_get_ex_data(&d->ex_data, idx); } -int DSA_security_bits(const DSA *d) -{ - if (d->p && d->q) - return BN_security_bits(BN_num_bits(d->p), BN_num_bits(d->q)); - return -1; -} - #ifndef OPENSSL_NO_DH DH *DSA_dup_DH(const DSA *r) { @@ -139,11 +132,6 @@ ENGINE *DSA_get0_engine(DSA *d) return d->engine; } -int DSA_bits(const DSA *dsa) -{ - return BN_num_bits(dsa->p); -} - int DSA_set_method(DSA *dsa, const DSA_METHOD *meth) { /* @@ -351,3 +339,14 @@ int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key) return 1; } +int DSA_security_bits(const DSA *d) +{ + if (d->p && d->q) + return BN_security_bits(BN_num_bits(d->p), BN_num_bits(d->q)); + return -1; +} + +int DSA_bits(const DSA *dsa) +{ + return BN_num_bits(dsa->p); +} -- cgit v1.2.3