From 500d67f15ac8199a39c3ba3861f71951766fbae4 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 5 Dec 2014 13:39:14 +0000 Subject: [PATCH] Clear existing extension state. When parsing ClientHello clear any existing extension state from SRP login and SRTP profile. Thanks to Karthikeyan Bhargavan for reporting this issue. Reviewed-by: Matt Caswell (cherry picked from commit 47606dda672a5008168f62d4b7d7f94cd2d31313) Conflicts: ssl/t1_lib.c --- ssl/t1_lib.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 1a5f4c1c23..179b467d45 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -1005,6 +1005,16 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in ssl_check_for_safari(s, data, d, n); #endif /* !OPENSSL_NO_EC */ +#ifndef OPENSSL_NO_SRP + if (s->srp_ctx.login != NULL) + { + OPENSSL_free(s->srp_ctx.login); + s->srp_ctx.login = NULL; + } +#endif + + s->srtp_profile = NULL; + if (data >= (d+n-2)) goto ri_check; n2s(data,len); -- 2.34.1