Resolve a stack set-up race condition (if the list of compression
authorBodo Möller <bodo@openssl.org>
Fri, 2 Dec 2011 12:51:41 +0000 (12:51 +0000)
committerBodo Möller <bodo@openssl.org>
Fri, 2 Dec 2011 12:51:41 +0000 (12:51 +0000)
methods isn't presorted, it will be sorted on first read).

Submitted by: Adam Langley

CHANGES
ssl/ssl_ciph.c

diff --git a/CHANGES b/CHANGES
index 5bf2952..b98e702 100644 (file)
--- a/CHANGES
+++ b/CHANGES
 
  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)]
 
   
  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)]
 
index c03f029..ac643c9 100644 (file)
@@ -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();
                        }