diff options
| author | Matt Caswell <matt@openssl.org> | 2017-08-31 14:32:51 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-08-31 15:03:35 +0100 |
| commit | 0ef2802165706016698d6984dfcb2980881f18e5 (patch) | |
| tree | e8e2a68cbe3484327102bc551cd17728ff36dfb0 /ssl/statem/extensions_clnt.c | |
| parent | 57dee9bb684268aa434a2bfe7ff4743a14a62ff0 (diff) | |
Various review fixes for PSK early_data support
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3926)
Diffstat (limited to 'ssl/statem/extensions_clnt.c')
| -rw-r--r-- | ssl/statem/extensions_clnt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c index bcbcbac873..8db895b0fe 100644 --- a/ssl/statem/extensions_clnt.c +++ b/ssl/statem/extensions_clnt.c @@ -1401,10 +1401,10 @@ int tls_parse_stoc_alpn(SSL *s, PACKET *pkt, unsigned int context, X509 *x, } s->s3->alpn_selected_len = len; - if (s->session->ext.alpn_selected != NULL - && (s->session->ext.alpn_selected_len != len - || memcmp(s->session->ext.alpn_selected, s->s3->alpn_selected, - len) != 0)) { + if (s->session->ext.alpn_selected == NULL + || s->session->ext.alpn_selected_len != len + || memcmp(s->session->ext.alpn_selected, s->s3->alpn_selected, len) + != 0) { /* ALPN not consistent with the old session so cannot use early_data */ s->ext.early_data_ok = 0; } |