diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-04-16 01:14:00 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-04-16 01:14:00 +1000 |
| commit | 7165593ce5a07a6860d4d408ad640ee707172936 (patch) | |
| tree | 3c892cf83045856b44bfaaeea2b67a9f0527e853 /include/crypto | |
| parent | b03ec3b5d62ee26bf8437556b9040d4141d5bdd8 (diff) | |
Add DH keygen to providers
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11332)
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/bn_dh.h | 3 | ||||
| -rw-r--r-- | include/crypto/dh.h | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/crypto/bn_dh.h b/include/crypto/bn_dh.h index 2864fb3319..c19d4f0734 100644 --- a/include/crypto/bn_dh.h +++ b/include/crypto/bn_dh.h @@ -16,12 +16,13 @@ declare_dh_bn(1024_160) declare_dh_bn(2048_224) declare_dh_bn(2048_256) +extern const BIGNUM _bignum_const_2; + extern const BIGNUM _bignum_ffdhe2048_p; 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_const_2; extern const BIGNUM _bignum_modp_1536_p; extern const BIGNUM _bignum_modp_2048_p; diff --git a/include/crypto/dh.h b/include/crypto/dh.h index 5d5470f165..150d13b370 100644 --- a/include/crypto/dh.h +++ b/include/crypto/dh.h @@ -11,15 +11,19 @@ #include <openssl/dh.h> #include "internal/ffc.h" -DH *dh_new_with_ctx(OPENSSL_CTX *libctx); +DH *dh_new_by_nid_with_libctx(OPENSSL_CTX *libctx, int nid); +DH *dh_new_with_libctx(OPENSSL_CTX *libctx); -int dh_generate_ffc_parameters(DH *dh, int bits, - int qbits, int gindex, BN_GENCB *cb); +int dh_generate_ffc_parameters(DH *dh, int type, int pbits, + int qbits, EVP_MD *md, BN_GENCB *cb); 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); FFC_PARAMS *dh_get0_params(DH *dh); int dh_get0_nid(const DH *dh); +int dh_ffc_params_fromdata(DH *dh, const OSSL_PARAM params[]); int dh_key_fromdata(DH *dh, const OSSL_PARAM params[]); int dh_check_pub_key_partial(const DH *dh, const BIGNUM *pub_key, int *ret); |