Commit 696de86f authored by Peter Wu's avatar Peter Wu Committed by Matt Caswell
Browse files

Fix stack-use-after-scope 



Fixes regression from #5667.

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarBen Kaduk <kaduk@mit.edu>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5701)
parent 9d9dc6ac

ssl/statem/extensions_clnt.c

+3 −1
Original line number Diff line number Diff line
@@ -744,6 +744,9 @@ EXT_RETURN tls_construct_ctos_early_data(SSL *s, WPACKET *pkt, 
                                         unsigned int context, X509 *x,

                                         size_t chainidx)

{

#ifndef OPENSSL_NO_PSK

    char identity[PSK_MAX_IDENTITY_LEN + 1];

#endif  /* OPENSSL_NO_PSK */

    const unsigned char *id = NULL;

    size_t idlen = 0;

    SSL_SESSION *psksess = NULL;
@@ -765,7 +768,6 @@ EXT_RETURN tls_construct_ctos_early_data(SSL *s, WPACKET *pkt, 


#ifndef OPENSSL_NO_PSK

    if (psksess == NULL && s->psk_client_callback != NULL) {

        char identity[PSK_MAX_IDENTITY_LEN + 1];

        unsigned char psk[PSK_MAX_PSK_LEN];

        size_t psklen = 0;