diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-21 15:06:28 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-11-18 14:14:52 +0000 |
| commit | 1072041b17adc9618644c813ea95e85cf54deced (patch) | |
| tree | 25c2f509ebbaa57dbb8134393637f8e5826e25c4 /ssl/s3_lib.c | |
| parent | 13c453728c076d5c1a65a5fd9424e15a9964d755 (diff) | |
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)
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index d67aa31d46..c2bdef6eae 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; |