generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix more race conditions

Browse Source 
Submitted by: "Patrick McCormick" <patrick@tellme.com>
PR: 262
This commit is contained in:
Bodo Möller 2002-09-26 15:52:34 +00:00
parent ba5ba5490d
commit 929f116733
5 changed files with 57 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGES
View File

@ -1928,10 +1928,10 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k
[Bodo Moeller] [Bodo Moeller]
*) Fix initialization code race conditions in *) Fix initialization code race conditions in
SSLv23_client_method(), SSLv23_server_method(), SSLv23_method(), SSLv23_client_method(), SSLv23_server_method(),
SSLv2_client_method(), SSLv2_server_method(), SSLv2_method(), SSLv2_client_method(), SSLv2_server_method(),
SSLv3_client_method(), SSLv3_server_method(), SSLv3_method(), SSLv3_client_method(), SSLv3_server_method(),
TLSv1_client_method(), TLSv1_server_method(), TLSv1_method(), TLSv1_client_method(), TLSv1_server_method(),
ssl2_get_cipher_by_char(), ssl2_get_cipher_by_char(),
ssl3_get_cipher_by_char(). ssl3_get_cipher_by_char().
[Patrick McCormick <patrick@tellme.com>, Bodo Moeller] [Patrick McCormick <patrick@tellme.com>, Bodo Moeller]

19
ssl/s23_meth.c
View File

@ -80,12 +80,19 @@ SSL_METHOD *SSLv23_method(void)
if (init) if (init)
{ {
memcpy((char *)&SSLv23_data,(char *)sslv23_base_method(), CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
sizeof(SSL_METHOD));
SSLv23_data.ssl_connect=ssl23_connect; if (init)
SSLv23_data.ssl_accept=ssl23_accept; {
SSLv23_data.get_ssl_method=ssl23_get_method; memcpy((char *)&SSLv23_data,(char *)sslv23_base_method(),
init=0; sizeof(SSL_METHOD));
SSLv23_data.ssl_connect=ssl23_connect;
SSLv23_data.ssl_accept=ssl23_accept;
SSLv23_data.get_ssl_method=ssl23_get_method;
init=0;
}
CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
} }
return(&SSLv23_data); return(&SSLv23_data);
} }

19
ssl/s2_meth.c
View File

@ -77,12 +77,19 @@ SSL_METHOD *SSLv2_method(void)
if (init) if (init)
{ {
memcpy((char *)&SSLv2_data,(char *)sslv2_base_method(), CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
sizeof(SSL_METHOD));
SSLv2_data.ssl_connect=ssl2_connect; if (init)
SSLv2_data.ssl_accept=ssl2_accept; {
SSLv2_data.get_ssl_method=ssl2_get_method; memcpy((char *)&SSLv2_data,(char *)sslv2_base_method(),
init=0; sizeof(SSL_METHOD));
SSLv2_data.ssl_connect=ssl2_connect;
SSLv2_data.ssl_accept=ssl2_accept;
SSLv2_data.get_ssl_method=ssl2_get_method;
init=0;
}
CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
} }
return(&SSLv2_data); return(&SSLv2_data);
} }

19
ssl/s3_meth.c
View File

@ -76,12 +76,19 @@ SSL_METHOD *SSLv3_method(void)
if (init) if (init)
{ {
memcpy((char *)&SSLv3_data,(char *)sslv3_base_method(), CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
sizeof(SSL_METHOD));
SSLv3_data.ssl_connect=ssl3_connect; if (init)
SSLv3_data.ssl_accept=ssl3_accept; {
SSLv3_data.get_ssl_method=ssl3_get_method; memcpy((char *)&SSLv3_data,(char *)sslv3_base_method(),
init=0; sizeof(SSL_METHOD));
SSLv3_data.ssl_connect=ssl3_connect;
SSLv3_data.ssl_accept=ssl3_accept;
SSLv3_data.get_ssl_method=ssl3_get_method;
init=0;
}
CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
} }
return(&SSLv3_data); return(&SSLv3_data);
} }

20
ssl/t1_meth.c
View File

@ -76,13 +76,21 @@ SSL_METHOD *TLSv1_method(void)
if (init) if (init)
{ {
memcpy((char *)&TLSv1_data,(char *)tlsv1_base_method(), CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
sizeof(SSL_METHOD));
TLSv1_data.ssl_connect=ssl3_connect; if (init)
TLSv1_data.ssl_accept=ssl3_accept; {
TLSv1_data.get_ssl_method=tls1_get_method; memcpy((char *)&TLSv1_data,(char *)tlsv1_base_method(),
init=0; sizeof(SSL_METHOD));
TLSv1_data.ssl_connect=ssl3_connect;
TLSv1_data.ssl_accept=ssl3_accept;
TLSv1_data.get_ssl_method=tls1_get_method;
init=0;
}
CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
} }
return(&TLSv1_data); return(&TLSv1_data);
} }