Fixed some race conditions. Submitted by: Reviewed by: PR:
diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c index 6c0e5a4..9de7b1d 100644 --- a/crypto/des/ecb_enc.c +++ b/crypto/des/ecb_enc.c
@@ -72,7 +72,6 @@ { const char *ptr,*unroll,*risc,*size; - init=0; #ifdef DES_PTR ptr="ptr"; #else @@ -98,6 +97,7 @@ else size="long"; sprintf(buf,"des(%s,%s,%s,%s)",ptr,risc,unroll,size); + init=0; } return(buf); }
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c index dbf13e6..5b2db35 100644 --- a/crypto/rand/md_rand.c +++ b/crypto/rand/md_rand.c
@@ -241,7 +241,6 @@ if (init) { - init=0; CRYPTO_w_unlock(CRYPTO_LOCK_RAND); /* put in some default random data, we need more than * just this */ @@ -281,6 +280,7 @@ memset(md,0,MD_DIGEST_LENGTH); #endif CRYPTO_w_lock(CRYPTO_LOCK_RAND); + init=0; } st_idx=state_index;
diff --git a/crypto/x509v3/v3err.c b/crypto/x509v3/v3err.c index a00dda7..febd36d 100644 --- a/crypto/x509v3/v3err.c +++ b/crypto/x509v3/v3err.c
@@ -151,7 +151,7 @@ #endif -void ERR_load_X509V3_strings(void) +void ERR_load_X509V3_strings() { static int init=1;
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index 61c7420..c7f85a6 100644 --- a/ssl/s23_clnt.c +++ b/ssl/s23_clnt.c
@@ -94,11 +94,11 @@ if (init) { - init=0; memcpy((char *)&SSLv23_client_data, (char *)sslv23_base_method(),sizeof(SSL_METHOD)); SSLv23_client_data.ssl_connect=ssl23_connect; SSLv23_client_data.get_ssl_method=ssl23_get_client_method; + init=0; } return(&SSLv23_client_data); }
diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c index edcbdbb..f1f8132 100644 --- a/ssl/s23_meth.c +++ b/ssl/s23_meth.c
@@ -85,12 +85,12 @@ if (init) { - init=0; memcpy((char *)&SSLv23_data,(char *)sslv23_base_method(), 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; } return(&SSLv23_data); }
diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c index 8dc0a06..f626c9c 100644 --- a/ssl/s23_srvr.c +++ b/ssl/s23_srvr.c
@@ -92,11 +92,11 @@ if (init) { - init=0; memcpy((char *)&SSLv23_server_data, (char *)sslv23_base_method(),sizeof(SSL_METHOD)); SSLv23_server_data.ssl_accept=ssl23_accept; SSLv23_server_data.get_ssl_method=ssl23_get_server_method; + init=0; } return(&SSLv23_server_data); }
diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index 5652549..3a79fd7 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c
@@ -103,11 +103,11 @@ if (init) { - init=0; memcpy((char *)&SSLv2_client_data,(char *)sslv2_base_method(), sizeof(SSL_METHOD)); SSLv2_client_data.ssl_connect=ssl2_connect; SSLv2_client_data.get_ssl_method=ssl2_get_client_method; + init=0; } return(&SSLv2_client_data); }
diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c index 43c7cab..4c734c9 100644 --- a/ssl/s2_lib.c +++ b/ssl/s2_lib.c
@@ -316,7 +316,7 @@ if (init) { - init=0; + CRYPTO_w_lock(CRYPTO_LOCK_SSL); for (i=0; i<SSL2_NUM_CIPHERS; i++) sorted[i]= &(ssl2_ciphers[i]); @@ -324,6 +324,9 @@ qsort( (char *)sorted, SSL2_NUM_CIPHERS,sizeof(SSL_CIPHER *), FP_ICC ssl_cipher_ptr_id_cmp); + + CRYPTO_w_unlock(CRYPTO_LOCK_SSL); + init=0; } id=0x02000000L|((unsigned long)p[0]<<16L)|
diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c index 7d7eed8..96ac159 100644 --- a/ssl/s2_meth.c +++ b/ssl/s2_meth.c
@@ -81,12 +81,12 @@ if (init) { - init=0; memcpy((char *)&SSLv2_data,(char *)sslv2_base_method(), 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; } return(&SSLv2_data); }
diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c index 8362129..d472d5d 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c
@@ -103,11 +103,11 @@ if (init) { - init=0; memcpy((char *)&SSLv2_server_data,(char *)sslv2_base_method(), sizeof(SSL_METHOD)); SSLv2_server_data.ssl_accept=ssl2_accept; SSLv2_server_data.get_ssl_method=ssl2_get_server_method; + init=0; } return(&SSLv2_server_data); }
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 4e58bcd..12f7ec6 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c
@@ -797,7 +797,7 @@ if (init) { - init=0; + CRYPTO_w_lock(CRYPTO_LOCK_SSL); for (i=0; i<SSL3_NUM_CIPHERS; i++) sorted[i]= &(ssl3_ciphers[i]); @@ -805,6 +805,10 @@ qsort( (char *)sorted, SSL3_NUM_CIPHERS,sizeof(SSL_CIPHER *), FP_ICC ssl_cipher_ptr_id_cmp); + + CRYPTO_w_unlock(CRYPTO_LOCK_SSL); + + init=0; } id=0x03000000L|((unsigned long)p[0]<<8L)|(unsigned long)p[1];
diff --git a/ssl/s3_meth.c b/ssl/s3_meth.c index d9cd9c2..d70165c 100644 --- a/ssl/s3_meth.c +++ b/ssl/s3_meth.c
@@ -81,12 +81,12 @@ if (init) { - init=0; memcpy((char *)&SSLv3_data,(char *)sslv3_base_method(), 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; } return(&SSLv3_data); }
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 06e5268..d3c2680 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c
@@ -116,11 +116,11 @@ if (init) { - init=0; memcpy((char *)&SSLv3_server_data,(char *)sslv3_base_method(), sizeof(SSL_METHOD)); SSLv3_server_data.ssl_accept=ssl3_accept; SSLv3_server_data.get_ssl_method=ssl3_get_server_method; + init=0; } return(&SSLv3_server_data); }
diff --git a/ssl/t1_clnt.c b/ssl/t1_clnt.c index 3cc03e3..429ad0e 100644 --- a/ssl/t1_clnt.c +++ b/ssl/t1_clnt.c
@@ -84,11 +84,11 @@ if (init) { - init=0; memcpy((char *)&TLSv1_client_data,(char *)tlsv1_base_method(), sizeof(SSL_METHOD)); TLSv1_client_data.ssl_connect=ssl3_connect; TLSv1_client_data.get_ssl_method=tls1_get_client_method; + init=0; } return(&TLSv1_client_data); }
diff --git a/ssl/t1_meth.c b/ssl/t1_meth.c index fb065d2..888ea3e 100644 --- a/ssl/t1_meth.c +++ b/ssl/t1_meth.c
@@ -81,12 +81,12 @@ if (init) { - init=0; memcpy((char *)&TLSv1_data,(char *)tlsv1_base_method(), 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; } return(&TLSv1_data); }
diff --git a/ssl/t1_srvr.c b/ssl/t1_srvr.c index 5603879..7e65f26 100644 --- a/ssl/t1_srvr.c +++ b/ssl/t1_srvr.c
@@ -85,11 +85,11 @@ if (init) { - init=0; memcpy((char *)&TLSv1_server_data,(char *)tlsv1_base_method(), sizeof(SSL_METHOD)); TLSv1_server_data.ssl_accept=ssl3_accept; TLSv1_server_data.get_ssl_method=tls1_get_server_method; + init=0; } return(&TLSv1_server_data); }