summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2011-12-02 12:51:05 +0000
committerBodo Möller <bodo@openssl.org>2011-12-02 12:51:05 +0000
commit44c854ddb9f17a17bb54570abcf33de635f5203b (patch)
tree9754febf23e80fa6234150b48971b90d6149bb9e /ssl
parent47091035f119f1390faf5327f229ab77a4a29977 (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
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_ciph.c1
1 files changed, 1 insertions, 0 deletions
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();
}