From: Bodo Möller <bodo@openssl.org>
Date: Fri, 2 Dec 2011 12:50:44 +0000 (+0000)
Subject: Resolve a stack set-up race condition (if the list of compression
X-Git-Tag: OpenSSL_0_9_8s~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=740da44f2094d40b7b6580a6cb61d072d873550c;p=oweals%2Fopenssl.git

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
---

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();
 			}