diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-11-02 17:35:19 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-11-02 17:35:19 +0000 |
commit | b6a9311a3edd056eaacbcbae2fcb723df5d99057 (patch) | |
tree | 720225dbdc898757e7df9a925ec85ade660013c1 /crypto/dh/dh_kdf.c | |
parent | 12df5ad9af4981f5d3c31a9819d31618c0f1af51 (diff) |
Import OpenSSL 1.0.2m.vendor/openssl/1.0.2m
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=325326
svn path=/vendor-crypto/openssl/1.0.2m/; revision=325327; tag=vendor/openssl/1.0.2m
Diffstat (limited to 'crypto/dh/dh_kdf.c')
-rw-r--r-- | crypto/dh/dh_kdf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c index a882cb286e0e..8947a0873152 100644 --- a/crypto/dh/dh_kdf.c +++ b/crypto/dh/dh_kdf.c @@ -51,6 +51,9 @@ * ==================================================================== */ +#include <e_os.h> + +#ifndef OPENSSL_NO_CMS #include <string.h> #include <openssl/dh.h> #include <openssl/evp.h> @@ -185,3 +188,4 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen, EVP_MD_CTX_cleanup(&mctx); return rv; } +#endif |