From 740da44f2094d40b7b6580a6cb61d072d873550c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bodo=20M=C3=B6ller?= Date: Fri, 2 Dec 2011 12:50:44 +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 | 3 +++ ssl/ssl_ciph.c | 1 + 2 files changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index 3771698bfd..8c9fd59be0 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,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 a34680ee85..a54c06ffb7 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -303,6 +303,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