From: Matt Caswell <matt@openssl.org>
Date: Wed, 21 Oct 2020 14:06:28 +0000 (+0100)
Subject: Return sensible values for some SSL ctrls
X-Git-Tag: openssl-3.0.0-alpha9~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1072041b17adc9618644c813ea95e85cf54deced;p=thirdparty%2Fopenssl.git

Return sensible values for some SSL ctrls

Some ctrls were always returning 0 even if they were successful.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13368)
---

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index d67aa31d46a..c2bdef6eaef 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3769,20 +3769,19 @@ long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp) (void))
     switch (cmd) {
 #if !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_DEPRECATED_3_0)
     case SSL_CTRL_SET_TMP_DH_CB:
-        {
-            s->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))fp;
-        }
+        s->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))fp;
+        ret = 1;
         break;
 #endif
     case SSL_CTRL_SET_TLSEXT_DEBUG_CB:
         s->ext.debug_cb = (void (*)(SSL *, int, int,
                                     const unsigned char *, int, void *))fp;
+        ret = 1;
         break;
 
     case SSL_CTRL_SET_NOT_RESUMABLE_SESS_CB:
-        {
-            s->not_resumable_session_cb = (int (*)(SSL *, int))fp;
-        }
+        s->not_resumable_session_cb = (int (*)(SSL *, int))fp;
+        ret = 1;
         break;
     default:
         break;