Make SSL_set_debug deprecated in 1.1

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 0897de395a02e296f5894896ba4ac21a86bc4f2b..53ee6557c4e895391a51261637c1682bb42457ec 100644 (file)
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -915,6 +915,7 @@ extern "C" {
 # define SSL_SESSION_get_app_data(s)     (SSL_SESSION_get_ex_data(s,0))
 # define SSL_CTX_get_app_data(ctx)       (SSL_CTX_get_ex_data(ctx,0))
 # define SSL_CTX_set_app_data(ctx,arg)   (SSL_CTX_set_ex_data(ctx,0,(char *)arg))
+DEPRECATEDIN_1_1_0(void SSL_set_debug(SSL *s, int debug))
 
 
 /*

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 03f338bc5393c9197248bddf1316e2f7de63bec2..90de7472c70c63e1710a69814da0759ba7041be9 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -3673,6 +3673,16 @@ int SSL_is_server(SSL *s)
     return s->server;
 }
 
+#if OPENSSL_API_COMPAT < 0x10100000L
+void SSL_set_debug(SSL *s, int debug)
+{
+    /* Old function was do-nothing anyway... */
+    (void)s;
+    (void)debug;
+}
+#endif
+
+
 void SSL_set_security_level(SSL *s, int level)
 {
     s->cert->sec_level = level;

diff --git a/util/ssleay.num b/util/ssleay.num
index b42765352c1f93584928be85f85e1375d55820d0..103d95f5379fef6f535519079fcab8648b8570d6 100755 (executable)
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -295,7 +295,7 @@ SSL_srp_server_param_with_username      336 1_1_0   EXIST:!VMS:FUNCTION:SRP
 SSL_srp_server_param_with_un            336    1_1_0   EXIST:VMS:FUNCTION:SRP
 SRP_have_to_put_srp_username            337    1_1_0   NOEXIST::FUNCTION:
 SSL_SRP_CTX_free                        338    1_1_0   EXIST::FUNCTION:SRP
-SSL_set_debug                           339    1_1_0   NOEXIST::FUNCTION:
+SSL_set_debug                           339    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_1_0
 SSL_SESSION_get0_peer                   340    1_1_0   EXIST::FUNCTION:
 TLSv1_2_client_method                   341    1_1_0   EXIST::FUNCTION:
 SSL_SESSION_set1_id_context             342    1_1_0   EXIST::FUNCTION: