summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES6
-rw-r--r--ssl/ssl_ciph.c1
2 files changed, 7 insertions, 0 deletions
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();
}