From 570486b90c694759709b1d6076f2922902a374ea Mon Sep 17 00:00:00 2001 From: Takashi Kojo Date: Sun, 27 Nov 2016 09:05:09 +0900 Subject: [PATCH] add SL_CTX_need/set_tmp_RSA --- src/ssl.c | 16 +--------------- wolfssl/openssl/ssl.h | 10 ++++++---- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index 3d5136e89..911966588 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -13906,7 +13906,7 @@ long wolfSSL_ASN1_INTEGER_get(const WOLFSSL_ASN1_INTEGER* i) } /*** TBC ***/ -WOLFSSL_API WOLFSSL_BIGNUM *ASN1_INTEGER_to_BN(const WOLFSSL_ASN1_INTEGER *ai, +WOLFSSL_API WOLFSSL_BIGNUM *wolfSSL_ASN1_INTEGER_to_BN(const WOLFSSL_ASN1_INTEGER *ai, WOLFSSL_BIGNUM *bn) { (void)ai; @@ -14224,20 +14224,6 @@ long wolfSSL_CTX_sess_number(WOLFSSL_CTX* ctx) return 0; } -/*** TBC ***/ -WOLFSSL_API long wolfSSL_CTX_need_tmp_RSA(WOLFSSL_CTX* ctx) -{ - (void)ctx; - return 0; -} - -/*** TBC ***/ -WOLFSSL_API long wolfSSL_CTX_set_tmp_rsa(WOLFSSL_CTX* ctx) -{ - (void)ctx; - return 0; -} - /*** TBC ***/ WOLFSSL_API long wolfSSL_CTX_add_extra_chain_cert(WOLFSSL_CTX* ctx) { diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h index 9467d53bf..186cd434a 100644 --- a/wolfssl/openssl/ssl.h +++ b/wolfssl/openssl/ssl.h @@ -448,8 +448,12 @@ typedef WOLFSSL_X509_STORE_CTX X509_STORE_CTX; #define SSL_CTX_get_ex_new_index wolfSSL_CTX_get_ex_new_index /*#if OPENSSL_API_COMPAT < 0x10100000L*/ -# define CONF_modules_free() -# define ENGINE_cleanup() +#define CONF_modules_free() +#define ENGINE_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 +#define SSL_set_tmp_rsa(ssl,rsa) 1 /*#endif*/ #define CONF_modules_unload() @@ -535,8 +539,6 @@ typedef WOLFSSL_X509_NAME_ENTRY X509_NAME_ENTRY; #define SSL_get_tlsext_status_ocsp_resp wolfSSL_get_tlsext_status_ocsp_resp #define SSL_set_tlsext_status_ocsp_resp wolfSSL_set_tlsext_status_ocsp_resp -#define SSL_CTX_need_tmp_RSA wolfSSL_CTX_need_tmp_RSA -#define SSL_CTX_set_tmp_rsa wolfSSL_CTX_set_tmp_rsa #define SSL_CTX_add_extra_chain_cert wolfSSL_CTX_add_extra_chain_cert #define SSL_CTX_get_read_ahead wolfSSL_CTX_get_read_ahead #define SSL_CTX_set_read_ahead wolfSSL_CTX_set_read_ahead