diff options
author | Bodo Möller <bodo@openssl.org> | 2011-12-02 12:52:00 +0000 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 2011-12-02 12:52:00 +0000 |
commit | 19b0d0e75b1ac7ea177d38aba4ba331ba9c93653 (patch) | |
tree | 41ecfe29edeabaa1ba87909e12716fc2da3d3a0e | |
parent | ea8c77a55bcf3ac0744ac8724ca2476818787330 (diff) |
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
-rw-r--r-- | CHANGES | 6 | ||||
-rw-r--r-- | ssl/ssl_ciph.c | 1 |
2 files changed, 7 insertions, 0 deletions
@@ -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(); } |