diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-04-20 11:07:38 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-04-20 11:07:38 +1000 |
| commit | 738ee1819e3bb94723701fb505ce2971afe47a9b (patch) | |
| tree | 2fd8588534087594f2371060c20bc6890d39a33a /include/crypto | |
| parent | 9e537cd2ad01b172f2700a670e9269075078a426 (diff) | |
Fix DH_get_nid() so that it does not cache values.
DH_set0_pqg() is now responsible for caching the nid, q and length.
DH with or without named safe prime groups now default to using the maximum private key length (BN_num_bits(q) - 1)
when generating a DH private key. The code is now shared between fips and non fips mode for DH key generation.
The OSSL_PKEY_PARAM_DH_PRIV_LEN parameter can be used during keygen to override the maximum private key length to be
in the range (2 * strength ... bits(q) - 1). Where the strength depends on the length of p.
Added q = (p - 1) / 2 safe prime BIGNUMS so that the code is data driven (To simplify adding new names).
The BIGNUMS were code generated.
Fix error in documented return value for DH_get_nid
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11562)
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/bn_dh.h | 13 | ||||
| -rw-r--r-- | include/crypto/dh.h | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/crypto/bn_dh.h b/include/crypto/bn_dh.h index c19d4f0734..b900c36651 100644 --- a/include/crypto/bn_dh.h +++ b/include/crypto/bn_dh.h @@ -9,8 +9,8 @@ #define declare_dh_bn(x) \ extern const BIGNUM _bignum_dh##x##_p; \ + extern const BIGNUM _bignum_dh##x##_q; \ extern const BIGNUM _bignum_dh##x##_g; \ - extern const BIGNUM _bignum_dh##x##_q; declare_dh_bn(1024_160) declare_dh_bn(2048_224) @@ -23,6 +23,11 @@ extern const BIGNUM _bignum_ffdhe3072_p; extern const BIGNUM _bignum_ffdhe4096_p; extern const BIGNUM _bignum_ffdhe6144_p; extern const BIGNUM _bignum_ffdhe8192_p; +extern const BIGNUM _bignum_ffdhe2048_q; +extern const BIGNUM _bignum_ffdhe3072_q; +extern const BIGNUM _bignum_ffdhe4096_q; +extern const BIGNUM _bignum_ffdhe6144_q; +extern const BIGNUM _bignum_ffdhe8192_q; extern const BIGNUM _bignum_modp_1536_p; extern const BIGNUM _bignum_modp_2048_p; @@ -30,3 +35,9 @@ extern const BIGNUM _bignum_modp_3072_p; extern const BIGNUM _bignum_modp_4096_p; extern const BIGNUM _bignum_modp_6144_p; extern const BIGNUM _bignum_modp_8192_p; +extern const BIGNUM _bignum_modp_1536_q; +extern const BIGNUM _bignum_modp_2048_q; +extern const BIGNUM _bignum_modp_3072_q; +extern const BIGNUM _bignum_modp_4096_q; +extern const BIGNUM _bignum_modp_6144_q; +extern const BIGNUM _bignum_modp_8192_q; diff --git a/include/crypto/dh.h b/include/crypto/dh.h index 150d13b370..1ae2c2f0a3 100644 --- a/include/crypto/dh.h +++ b/include/crypto/dh.h @@ -20,6 +20,7 @@ int dh_generate_public_key(BN_CTX *ctx, DH *dh, const BIGNUM *priv_key, BIGNUM *pub_key); int dh_get_named_group_uid_from_size(int pbits); const char *dh_gen_type_id2name(int id); +void dh_cache_named_group(DH *dh); FFC_PARAMS *dh_get0_params(DH *dh); int dh_get0_nid(const DH *dh); |