提交 a90ae024 编写于 作者: B Bodo Möller

fix race condition

PR: 262
上级 4c8f79a3
...@@ -1923,6 +1923,9 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k ...@@ -1923,6 +1923,9 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k
Changes between 0.9.6g and 0.9.6h [xx XXX xxxx] Changes between 0.9.6g and 0.9.6h [xx XXX xxxx]
*) Fix race condition in SSLv3_client_method().
[Bodo Moeller]
*) Reorder cleanup sequence in SSL_CTX_free(): only remove the ex_data after *) Reorder cleanup sequence in SSL_CTX_free(): only remove the ex_data after
the cached sessions are flushed, as the remove_cb() might use ex_data the cached sessions are flushed, as the remove_cb() might use ex_data
contents. Bug found by Sam Varshavchik <mrsam@courier-mta.com> contents. Bug found by Sam Varshavchik <mrsam@courier-mta.com>
......
...@@ -178,11 +178,11 @@ SSL_METHOD *SSLv3_client_method(void) ...@@ -178,11 +178,11 @@ SSL_METHOD *SSLv3_client_method(void)
if (init) if (init)
{ {
init=0;
memcpy((char *)&SSLv3_client_data,(char *)sslv3_base_method(), memcpy((char *)&SSLv3_client_data,(char *)sslv3_base_method(),
sizeof(SSL_METHOD)); sizeof(SSL_METHOD));
SSLv3_client_data.ssl_connect=ssl3_connect; SSLv3_client_data.ssl_connect=ssl3_connect;
SSLv3_client_data.get_ssl_method=ssl3_get_client_method; SSLv3_client_data.get_ssl_method=ssl3_get_client_method;
init=0;
} }
return(&SSLv3_client_data); return(&SSLv3_client_data);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册