From 44c854ddb9f17a17bb54570abcf33de635f5203b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bodo=20M=C3=B6ller?= Date: Fri, 2 Dec 2011 12:51:05 +0000 Subject: [PATCH] Resolve a stack set-up race condition (if the list of compression methods isn't presorted, it will be sorted on first read). Submitted by: Adam Langley --- CHANGES | 6 ++++++ ssl/ssl_ciph.c | 1 + 2 files changed, 7 insertions(+) diff --git a/CHANGES b/CHANGES index 09fa00d656..eb0867ba3b 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,9 @@ Changes between 1.0.0e and 1.0.0f [xx XXX xxxx] + *) Fix ssl_ciph.c set-up race. + [Adam Langley (Google)] + *) Fix spurious failures in ecdsatest.c. [Emilia Käsper (Google)] @@ -931,6 +934,9 @@ Changes between 0.9.8r and 0.9.8s [xx XXX xxxx] + *) Fix ssl_ciph.c set-up race. + [Adam Langley (Google)] + *) Fix spurious failures in ecdsatest.c. [Emilia Käsper (Google)] diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index a8ce186b78..54ba7ef5b4 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -446,6 +446,7 @@ static void load_builtin_compressions(void) sk_SSL_COMP_push(ssl_comp_methods,comp); } } + sk_SSL_COMP_sort(ssl_comp_methods); } MemCheck_on(); } -- 2.25.1