diff options
| author | David Bar <david.bar@gmail.com> | 2015-08-03 12:45:26 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-09-03 14:45:15 -0400 |
| commit | e968561d5e762e6c05e74541137916b4f20a144b (patch) | |
| tree | 5d027d197adcb63ee3457d38534cd4cdb9ea6739 /include | |
| parent | 231efb936548320e81c3259b41c26bb71e83720a (diff) | |
RT3674: Make no-cms build work.
Also has changes from from David Woodhouse <David.Woodhouse@intel.com>
and some tweaks from me.
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/dh.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/openssl/dh.h b/include/openssl/dh.h index f1de53dffe..f5b03d32f5 100644 --- a/include/openssl/dh.h +++ b/include/openssl/dh.h @@ -239,11 +239,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, \ @@ -336,7 +338,9 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen, /* KDF types */ # define EVP_PKEY_DH_KDF_NONE 1 +# ifndef OPENSSL_NO_CMS # define EVP_PKEY_DH_KDF_X9_42 2 +# endif /* BEGIN ERROR CODES */ /* |