From 778680116e686802891672fad4aa495fb520da24 Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Mon, 28 Nov 2016 10:13:30 +0900 Subject: [PATCH] HMAC_cleanup, MD5xxx for bsd --- wolfssl/openssl/md5.h | 9 +++++++-- wolfssl/openssl/ssl.h | 1 + wolfssl/ssl.h | 2 -- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/wolfssl/openssl/md5.h b/wolfssl/openssl/md5.h index bdcda5b98..2e8620825 100644 --- a/wolfssl/openssl/md5.h +++ b/wolfssl/openssl/md5.h @@ -32,11 +32,16 @@ typedef WOLFSSL_MD5_CTX MD5_CTX; #define MD5_Update wolfSSL_MD5_Update #define MD5_Final wolfSSL_MD5_Final +#ifdef OPENSSL_EXTRA_BSD + #define MD5Init wolfSSL_MD5_Init + #define MD5Update wolfSSL_MD5_Update + #define MD5Final wolfSSL_MD5_Final +#endif + #ifdef __cplusplus - } /* extern "C" */ + } /* extern "C" */ #endif #endif /* NO_MD5 */ #endif /* WOLFSSL_MD5_H_ */ - diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h index 186cd434a..a8ecfebc6 100644 --- a/wolfssl/openssl/ssl.h +++ b/wolfssl/openssl/ssl.h @@ -450,6 +450,7 @@ typedef WOLFSSL_X509_STORE_CTX X509_STORE_CTX; /*#if OPENSSL_API_COMPAT < 0x10100000L*/ #define CONF_modules_free() #define ENGINE_cleanup() +#define HMAC_CTX_cleanup wolfSSL_HMAC_cleanup #define SSL_CTX_need_tmp_RSA(ctx) 0 #define SSL_CTX_set_tmp_rsa(ctx,rsa) 1 #define SSL_need_tmp_RSA(ssl) 0 diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index 0277e761b..1b759da67 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -693,8 +693,6 @@ WOLFSSL_API long wolfSSL_CTX_sess_misses(WOLFSSL_CTX*); WOLFSSL_API long wolfSSL_CTX_sess_timeouts(WOLFSSL_CTX*); WOLFSSL_API long wolfSSL_CTX_sess_number(WOLFSSL_CTX*); -WOLFSSL_API long wolfSSL_CTX_need_tmp_RSA(WOLFSSL_CTX*); -WOLFSSL_API long wolfSSL_CTX_set_tmp_rsa(WOLFSSL_CTX*); WOLFSSL_API long wolfSSL_CTX_add_extra_chain_cert(WOLFSSL_CTX*); WOLFSSL_API long wolfSSL_CTX_sess_set_cache_size(WOLFSSL_CTX*, long); WOLFSSL_API long wolfSSL_CTX_sess_get_cache_size(WOLFSSL_CTX*);