diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2005-08-05 23:52:08 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2005-08-05 23:52:08 +0000 |
commit | 222f2246640d8bd00f509f47c436e8e48d4d67a9 (patch) | |
tree | dd8f7251ec1c20e5fd4fe14df1c35563889ce087 /ssl/s2_meth.c | |
parent | 62b6cd007f5aee952acf52e087d535594b6eae15 (diff) |
Initialize SSL_METHOD structures at compile time. This removes the need
for locking code. The CRYPTO_LOCK_SSL_METHOD lock is now no longer used.
Diffstat (limited to 'ssl/s2_meth.c')
-rw-r--r-- | ssl/s2_meth.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c index 8b6cbd086e..a35e435b71 100644 --- a/ssl/s2_meth.c +++ b/ssl/s2_meth.c @@ -70,29 +70,11 @@ static SSL_METHOD *ssl2_get_method(int ver) return(NULL); } -SSL_METHOD *SSLv2_method(void) - { - static int init=1; - static SSL_METHOD SSLv2_data; +IMPLEMENT_ssl2_meth_func(SSLv2_method, + ssl2_accept, + ssl2_connect, + ssl2_get_method) - if (init) - { - CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD); - - if (init) - { - 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; - } - - CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD); - } - return(&SSLv2_data); - } #else /* !OPENSSL_NO_SSL2 */ # if PEDANTIC |