From 0e699ff0466d0fa2542259ad6ae863b5b31d5c6f Mon Sep 17 00:00:00 2001 From: TakayukiMatsuo Date: Thu, 11 Mar 2021 00:04:17 +0900 Subject: [PATCH] Remove NO_WOLFSSL_STUB guard and add a comment to each wolfSSL_set_dynlock_xxx API. --- src/ssl.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index bc4f620ab..aaa7d113b 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -24592,32 +24592,40 @@ int wolfSSL_COMP_add_compression_method(int method, void* data) } #endif -#ifndef NO_WOLFSSL_STUB +/* wolfSSL_set_dynlock_create_callback + * CRYPTO_set_dynlock_create_callback has been deprecated since openSSL 1.0.1. + * This function exists for compatibility purposes because wolfSSL satisfies + * thread safety without relying on the callback. + */ void wolfSSL_set_dynlock_create_callback(WOLFSSL_dynlock_value* (*f)( const char*, int)) { WOLFSSL_STUB("CRYPTO_set_dynlock_create_callback"); (void)f; } -#endif - -#ifndef NO_WOLFSSL_STUB +/* wolfSSL_set_dynlock_lock_callback + * CRYPTO_set_dynlock_lock_callback has been deprecated since openSSL 1.0.1. + * This function exists for compatibility purposes because wolfSSL satisfies + * thread safety without relying on the callback. + */ void wolfSSL_set_dynlock_lock_callback( void (*f)(int, WOLFSSL_dynlock_value*, const char*, int)) { WOLFSSL_STUB("CRYPTO_set_set_dynlock_lock_callback"); (void)f; } -#endif - -#ifndef NO_WOLFSSL_STUB +/* wolfSSL_set_dynlock_destroy_callback + * CRYPTO_set_dynlock_destroy_callback has been deprecated since openSSL 1.0.1. + * This function exists for compatibility purposes because wolfSSL satisfies + * thread safety without relying on the callback. + */ void wolfSSL_set_dynlock_destroy_callback( void (*f)(WOLFSSL_dynlock_value*, const char*, int)) { WOLFSSL_STUB("CRYPTO_set_set_dynlock_destroy_callback"); (void)f; } -#endif + #endif /* OPENSSL_EXTRA */