diff options
author | Bodo Möller <bodo@openssl.org> | 1999-04-22 13:37:46 +0000 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 1999-04-22 13:37:46 +0000 |
commit | 5cc146f344bd2225e7afa66052a8401468b94ef4 (patch) | |
tree | fed6103a36e32b130cb0ec6ba4ae6c4c9540f848 /ssl | |
parent | 4cd401e401c4526768f0ca9257129e749431b384 (diff) |
Fixed some race conditions.
Submitted by:
Reviewed by:
PR:
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/s23_clnt.c | 2 | ||||
-rw-r--r-- | ssl/s23_meth.c | 2 | ||||
-rw-r--r-- | ssl/s23_srvr.c | 2 | ||||
-rw-r--r-- | ssl/s2_clnt.c | 2 | ||||
-rw-r--r-- | ssl/s2_lib.c | 5 | ||||
-rw-r--r-- | ssl/s2_meth.c | 2 | ||||
-rw-r--r-- | ssl/s2_srvr.c | 2 | ||||
-rw-r--r-- | ssl/s3_lib.c | 6 | ||||
-rw-r--r-- | ssl/s3_meth.c | 2 | ||||
-rw-r--r-- | ssl/s3_srvr.c | 2 | ||||
-rw-r--r-- | ssl/t1_clnt.c | 2 | ||||
-rw-r--r-- | ssl/t1_meth.c | 2 | ||||
-rw-r--r-- | ssl/t1_srvr.c | 2 |
13 files changed, 20 insertions, 13 deletions
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index 61c7420135..c7f85a621f 100644 --- a/ssl/s23_clnt.c +++ b/ssl/s23_clnt.c @@ -94,11 +94,11 @@ SSL_METHOD *SSLv23_client_method(void) 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 edcbdbb2bd..f1f81325be 100644 --- a/ssl/s23_meth.c +++ b/ssl/s23_meth.c @@ -85,12 +85,12 @@ SSL_METHOD *SSLv23_method(void) 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 8dc0a0608f..f626c9cb06 100644 --- a/ssl/s23_srvr.c +++ b/ssl/s23_srvr.c @@ -92,11 +92,11 @@ SSL_METHOD *SSLv23_server_method(void) 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 5652549dac..3a79fd7412 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c @@ -103,11 +103,11 @@ SSL_METHOD *SSLv2_client_method(void) 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 43c7cab3ed..4c734c9acf 100644 --- a/ssl/s2_lib.c +++ b/ssl/s2_lib.c @@ -316,7 +316,7 @@ SSL_CIPHER *ssl2_get_cipher_by_char(const unsigned char *p) 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 @@ SSL_CIPHER *ssl2_get_cipher_by_char(const unsigned char *p) 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 7d7eed8a8f..96ac159ce4 100644 --- a/ssl/s2_meth.c +++ b/ssl/s2_meth.c @@ -81,12 +81,12 @@ SSL_METHOD *SSLv2_method(void) 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 83621290fb..d472d5d5af 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -103,11 +103,11 @@ SSL_METHOD *SSLv2_server_method(void) 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 4e58bcd632..12f7ec60b6 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -797,7 +797,7 @@ SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p) 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 @@ SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p) 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 d9cd9c2210..d70165cb40 100644 --- a/ssl/s3_meth.c +++ b/ssl/s3_meth.c @@ -81,12 +81,12 @@ SSL_METHOD *SSLv3_method(void) 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 06e5268a54..d3c2680e56 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -116,11 +116,11 @@ SSL_METHOD *SSLv3_server_method(void) 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 3cc03e3887..429ad0eca5 100644 --- a/ssl/t1_clnt.c +++ b/ssl/t1_clnt.c @@ -84,11 +84,11 @@ SSL_METHOD *TLSv1_client_method(void) 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 fb065d2c94..888ea3e6a8 100644 --- a/ssl/t1_meth.c +++ b/ssl/t1_meth.c @@ -81,12 +81,12 @@ SSL_METHOD *TLSv1_method(void) 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 5603879284..7e65f263fc 100644 --- a/ssl/t1_srvr.c +++ b/ssl/t1_srvr.c @@ -85,11 +85,11 @@ SSL_METHOD *TLSv1_server_method(void) 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); } |