The branch master has been updated
via a5bb1aa128dcadf7a026061b2804646f5fbaa72c (commit)
from 1ae4c07e50a4988c7e2263ad669dc75fe2d494cb (commit)
- Log -----------------------------------------------------------------
commit a5bb1aa128dcadf7a026061b2804646f5fbaa72c
Author: Benjamin Kaduk <[email protected]>
Date: Tue Mar 14 19:17:15 2017 -0500
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 <[email protected]>
Reviewed-by: Richard Levitte <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/2954)
-----------------------------------------------------------------------
Summary of changes:
ssl/statem/extensions.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index ffacd41..0ab1f04 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;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
