wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

really fix race condition

Browse source 
PR: 262
This commit is contained in:
Bodo Möller 2002-09-23 14:25:07 +00:00
parent 40e66398db
commit e78f137899
11 changed files with 66 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -1927,8 +1927,12 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k
(the SSL 3.0 and TLS 1.0 specifications allow any length up to 32 bytes). (the SSL 3.0 and TLS 1.0 specifications allow any length up to 32 bytes).
[Bodo Moeller] [Bodo Moeller]
*) Fix race condition in SSLv3_client_method(). *) Fix initialization code race conditions in
[Bodo Moeller] SSLv23_client_method(), SSLv23_server_method(),
SSLv2_client_method(), SSLv2_server_method(),
SSLv3_client_method(), SSLv3_server_method(),
TLSv1_client_method(), TLSv1_server_method().
[Patrick McCormick <patrick@tellme.com>, 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

3
crypto/cryptlib.c
View file

@ -94,6 +94,7 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] =
"ssl_session", "ssl_session",
"ssl_sess_cert", "ssl_sess_cert",
"ssl", "ssl",
"ssl_method",
"rand", "rand",
"rand2", "rand2",
"debug_malloc", "debug_malloc",
@ -111,7 +112,7 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] =
"ecdsa", "ecdsa",
"ec", "ec",
"ecdh", "ecdh",
#if CRYPTO_NUM_LOCKS != 34 #if CRYPTO_NUM_LOCKS != 35
# error "Inconsistency between crypto.h and cryptlib.c" # error "Inconsistency between crypto.h and cryptlib.c"
#endif #endif
}; };

51
crypto/crypto.h
View file

@ -111,30 +111,31 @@ extern "C" {
#define CRYPTO_LOCK_DSA 8 #define CRYPTO_LOCK_DSA 8
#define CRYPTO_LOCK_RSA 9 #define CRYPTO_LOCK_RSA 9
#define CRYPTO_LOCK_EVP_PKEY 10 #define CRYPTO_LOCK_EVP_PKEY 10
#define CRYPTO_LOCK_X509_STORE 11 #define CRYPTO_LOCK_X509_STORE 11
#define CRYPTO_LOCK_SSL_CTX 12 #define CRYPTO_LOCK_SSL_CTX 12
#define CRYPTO_LOCK_SSL_CERT 13 #define CRYPTO_LOCK_SSL_CERT 13
#define CRYPTO_LOCK_SSL_SESSION 14 #define CRYPTO_LOCK_SSL_SESSION 14
#define CRYPTO_LOCK_SSL_SESS_CERT 15 #define CRYPTO_LOCK_SSL_SESS_CERT 15
#define CRYPTO_LOCK_SSL 16 #define CRYPTO_LOCK_SSL 16
#define CRYPTO_LOCK_RAND 17 #define CRYPTO_LOCK_SSL_METHOD 17
#define CRYPTO_LOCK_RAND2 18 #define CRYPTO_LOCK_RAND 18
#define CRYPTO_LOCK_MALLOC 19 #define CRYPTO_LOCK_RAND2 19
#define CRYPTO_LOCK_BIO 20 #define CRYPTO_LOCK_MALLOC 20
#define CRYPTO_LOCK_GETHOSTBYNAME 21 #define CRYPTO_LOCK_BIO 21
#define CRYPTO_LOCK_GETSERVBYNAME 22 #define CRYPTO_LOCK_GETHOSTBYNAME 22
#define CRYPTO_LOCK_READDIR 23 #define CRYPTO_LOCK_GETSERVBYNAME 23
#define CRYPTO_LOCK_RSA_BLINDING 24 #define CRYPTO_LOCK_READDIR 24
#define CRYPTO_LOCK_DH 25 #define CRYPTO_LOCK_RSA_BLINDING 25
#define CRYPTO_LOCK_MALLOC2 26 #define CRYPTO_LOCK_DH 26
#define CRYPTO_LOCK_DSO 27 #define CRYPTO_LOCK_MALLOC2 27
#define CRYPTO_LOCK_DYNLOCK 28 #define CRYPTO_LOCK_DSO 28
#define CRYPTO_LOCK_ENGINE 29 #define CRYPTO_LOCK_DYNLOCK 29
#define CRYPTO_LOCK_UI 30 #define CRYPTO_LOCK_ENGINE 30
#define CRYPTO_LOCK_ECDSA 31 #define CRYPTO_LOCK_UI 31
#define CRYPTO_LOCK_EC 32 #define CRYPTO_LOCK_ECDSA 32
#define CRYPTO_LOCK_ECDH 33 #define CRYPTO_LOCK_EC 33
#define CRYPTO_NUM_LOCKS 34 #define CRYPTO_LOCK_ECDH 34
#define CRYPTO_NUM_LOCKS 35
#define CRYPTO_LOCK 1 #define CRYPTO_LOCK 1
#define CRYPTO_UNLOCK 2 #define CRYPTO_UNLOCK 2
@ -156,7 +157,7 @@ extern "C" {
#endif #endif
#else #else
#define CRYPTO_w_lock(a) #define CRYPTO_w_lock(a)
#define CRYPTO_w_unlock(a) #define CRYPTO_w_unlock(a)
#define CRYPTO_r_lock(a) #define CRYPTO_r_lock(a)
#define CRYPTO_r_unlock(a) #define CRYPTO_r_unlock(a)
#define CRYPTO_add(a,b,c) ((*(a))+=(b)) #define CRYPTO_add(a,b,c) ((*(a))+=(b))

4
ssl/s23_clnt.c
View file

@ -87,11 +87,15 @@ SSL_METHOD *SSLv23_client_method(void)
if (init) if (init)
{ {
CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
memcpy((char *)&SSLv23_client_data, memcpy((char *)&SSLv23_client_data,
(char *)sslv23_base_method(),sizeof(SSL_METHOD)); (char *)sslv23_base_method(),sizeof(SSL_METHOD));
SSLv23_client_data.ssl_connect=ssl23_connect; SSLv23_client_data.ssl_connect=ssl23_connect;
SSLv23_client_data.get_ssl_method=ssl23_get_client_method; SSLv23_client_data.get_ssl_method=ssl23_get_client_method;
init=0; init=0;
CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
} }
return(&SSLv23_client_data); return(&SSLv23_client_data);
} }

4
ssl/s23_srvr.c
View file

@ -139,11 +139,15 @@ SSL_METHOD *SSLv23_server_method(void)
if (init) if (init)
{ {
CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
memcpy((char *)&SSLv23_server_data, memcpy((char *)&SSLv23_server_data,
(char *)sslv23_base_method(),sizeof(SSL_METHOD)); (char *)sslv23_base_method(),sizeof(SSL_METHOD));
SSLv23_server_data.ssl_accept=ssl23_accept; SSLv23_server_data.ssl_accept=ssl23_accept;
SSLv23_server_data.get_ssl_method=ssl23_get_server_method; SSLv23_server_data.get_ssl_method=ssl23_get_server_method;
init=0; init=0;
CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
} }
return(&SSLv23_server_data); return(&SSLv23_server_data);
} }

4
ssl/s2_clnt.c
View file

@ -145,11 +145,15 @@ SSL_METHOD *SSLv2_client_method(void)
if (init) if (init)
{ {
CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
memcpy((char *)&SSLv2_client_data,(char *)sslv2_base_method(), memcpy((char *)&SSLv2_client_data,(char *)sslv2_base_method(),
sizeof(SSL_METHOD)); sizeof(SSL_METHOD));
SSLv2_client_data.ssl_connect=ssl2_connect; SSLv2_client_data.ssl_connect=ssl2_connect;
SSLv2_client_data.get_ssl_method=ssl2_get_client_method; SSLv2_client_data.get_ssl_method=ssl2_get_client_method;
init=0; init=0;
CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
} }
return(&SSLv2_client_data); return(&SSLv2_client_data);
} }

4
ssl/s2_srvr.c
View file

@ -145,11 +145,15 @@ SSL_METHOD *SSLv2_server_method(void)
if (init) if (init)
{ {
CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
memcpy((char *)&SSLv2_server_data,(char *)sslv2_base_method(), memcpy((char *)&SSLv2_server_data,(char *)sslv2_base_method(),
sizeof(SSL_METHOD)); sizeof(SSL_METHOD));
SSLv2_server_data.ssl_accept=ssl2_accept; SSLv2_server_data.ssl_accept=ssl2_accept;
SSLv2_server_data.get_ssl_method=ssl2_get_server_method; SSLv2_server_data.get_ssl_method=ssl2_get_server_method;
init=0; init=0;
CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
} }
return(&SSLv2_server_data); return(&SSLv2_server_data);
} }

4
ssl/s3_clnt.c
View file

@ -178,11 +178,15 @@ SSL_METHOD *SSLv3_client_method(void)
if (init) if (init)
{ {
CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
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; init=0;
CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
} }
return(&SSLv3_client_data); return(&SSLv3_client_data);
} }

4
ssl/s3_srvr.c
View file

@ -181,11 +181,15 @@ SSL_METHOD *SSLv3_server_method(void)
if (init) if (init)
{ {
CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
memcpy((char *)&SSLv3_server_data,(char *)sslv3_base_method(), memcpy((char *)&SSLv3_server_data,(char *)sslv3_base_method(),
sizeof(SSL_METHOD)); sizeof(SSL_METHOD));
SSLv3_server_data.ssl_accept=ssl3_accept; SSLv3_server_data.ssl_accept=ssl3_accept;
SSLv3_server_data.get_ssl_method=ssl3_get_server_method; SSLv3_server_data.get_ssl_method=ssl3_get_server_method;
init=0; init=0;
CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
} }
return(&SSLv3_server_data); return(&SSLv3_server_data);
} }

4
ssl/t1_clnt.c
View file

@ -79,11 +79,15 @@ SSL_METHOD *TLSv1_client_method(void)
if (init) if (init)
{ {
CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
memcpy((char *)&TLSv1_client_data,(char *)tlsv1_base_method(), memcpy((char *)&TLSv1_client_data,(char *)tlsv1_base_method(),
sizeof(SSL_METHOD)); sizeof(SSL_METHOD));
TLSv1_client_data.ssl_connect=ssl3_connect; TLSv1_client_data.ssl_connect=ssl3_connect;
TLSv1_client_data.get_ssl_method=tls1_get_client_method; TLSv1_client_data.get_ssl_method=tls1_get_client_method;
init=0; init=0;
CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
} }
return(&TLSv1_client_data); return(&TLSv1_client_data);
} }

4
ssl/t1_srvr.c
View file

@ -80,11 +80,15 @@ SSL_METHOD *TLSv1_server_method(void)
if (init) if (init)
{ {
CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
memcpy((char *)&TLSv1_server_data,(char *)tlsv1_base_method(), memcpy((char *)&TLSv1_server_data,(char *)tlsv1_base_method(),
sizeof(SSL_METHOD)); sizeof(SSL_METHOD));
TLSv1_server_data.ssl_accept=ssl3_accept; TLSv1_server_data.ssl_accept=ssl3_accept;
TLSv1_server_data.get_ssl_method=tls1_get_server_method; TLSv1_server_data.get_ssl_method=tls1_get_server_method;
init=0; init=0;
CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
} }
return(&TLSv1_server_data); return(&TLSv1_server_data);
} }