diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-03-20 23:47:06 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-03-21 10:38:07 +0100 |
| commit | 696de86f8edefdf885a665ed9166ee2432f2ee30 (patch) | |
| tree | 52e6ec3d787926afc3f95e58c3460a9826f5a10d /ssl | |
| parent | o_fopen.c,rand/randfile.c: compensate for e_os.h omission. (diff) | |
| download | openssl-696de86f8edefdf885a665ed9166ee2432f2ee30.tar.xz openssl-696de86f8edefdf885a665ed9166ee2432f2ee30.zip | |
Fix stack-use-after-scope
Fixes regression from #5667.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5701)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/statem/extensions_clnt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c index bebf73a49c..5c360042ae 100644 --- a/ssl/statem/extensions_clnt.c +++ b/ssl/statem/extensions_clnt.c @@ -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; |