diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-07-06 10:11:17 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-08-15 12:54:47 +0200 |
| commit | d46d2da41c75ff765c914bf1c19063e97c8c519a (patch) | |
| tree | 463d6ee44ce54538cb6109999dee8ed2756bb53a /crypto/dh/dh.h | |
| parent | 3735a900eddcb7a1355e43fa3ad8928db7837dcb (diff) | |
Fix 'no-cms'
Fixes #3867
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3873)
Diffstat (limited to 'crypto/dh/dh.h')
| -rw-r--r-- | crypto/dh/dh.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h index a228c7a7a4..80b28fb39d 100644 --- a/crypto/dh/dh.h +++ b/crypto/dh/dh.h @@ -257,11 +257,13 @@ DH *DH_get_1024_160(void); DH *DH_get_2048_224(void); DH *DH_get_2048_256(void); +# ifndef OPENSSL_NO_CMS /* RFC2631 KDF */ int DH_KDF_X9_42(unsigned char *out, size_t outlen, const unsigned char *Z, size_t Zlen, ASN1_OBJECT *key_oid, const unsigned char *ukm, size_t ukmlen, const EVP_MD *md); +# endif # define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \ EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \ |