Commit e596c68c authored by Graham Edgecombe's avatar Graham Edgecombe Committed by Matt Caswell
Browse files

Return success in custom_ext_parse_old_cb_wrap if parse_cb is NULL 



This fixes a segfault if a NULL parse_cb is passed to
SSL_CTX_add_{client,server}_custom_ext, which was supported in the
pre-1.1.1 implementation.

This behaviour is consistent with the other custom_ext_*_old_cb_wrap
functions, and with the new SSL_CTX_add_custom_ext function.

CLA: trivial

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3310)
parent 8ed9a266

ssl/statem/extensions_cust.c

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ static int custom_ext_parse_old_cb_wrap(SSL *s, unsigned int ext_type, 
    custom_ext_parse_cb_wrap *parse_cb_wrap =

        (custom_ext_parse_cb_wrap *)parse_arg;



    if (parse_cb_wrap->parse_cb == NULL)

        return 1;



    return parse_cb_wrap->parse_cb(s, ext_type, in, inlen, al,

                                   parse_cb_wrap->parse_arg);

}