summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Kaduk <bkaduk@akamai.com>2017-03-14 19:17:15 -0500
committerRichard Levitte <levitte@openssl.org>2017-03-15 03:18:01 +0100
commita5bb1aa128dcadf7a026061b2804646f5fbaa72c (patch)
treec066603523f06ef62116bd341ef182da1c5aa8d5
parent1ae4c07e50a4988c7e2263ad669dc75fe2d494cb (diff)
Clear alpn_selected_len for clients, too
Zero out the length alongside the NULLing of the pointer, to bring parity between the selected and proposed fields.. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2954)
-rw-r--r--ssl/statem/extensions.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index ffacd41cf9..0ab1f0494c 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -875,8 +875,8 @@ static int init_alpn(SSL *s, unsigned int context)
{
OPENSSL_free(s->s3->alpn_selected);
s->s3->alpn_selected = NULL;
+ s->s3->alpn_selected_len = 0;
if (s->server) {
- s->s3->alpn_selected_len = 0;
OPENSSL_free(s->s3->alpn_proposed);
s->s3->alpn_proposed = NULL;
s->s3->alpn_proposed_len = 0;