From 19b0d0e75b1ac7ea177d38aba4ba331ba9c93653 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bodo=20M=C3=B6ller?= Date: Fri, 2 Dec 2011 12:52:00 +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 ab83fa21d2..a453a7bf8d 100644 --- a/CHANGES +++ b/CHANGES @@ -487,6 +487,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)] @@ -1414,6 +1417,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 c03f029748..ac643c928c 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -470,6 +470,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.34.1