diff options
| author | simon <simon@FreeBSD.org> | 2006-07-29 19:14:51 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2006-07-29 19:14:51 +0000 |
| commit | e07cc0214a55c667871ff33ceb54311ec000283e (patch) | |
| tree | f898e2a96cfe066221d2bdd627d5eddc70044a57 /crypto/openssl/ssl/s2_meth.c | |
| parent | 9159ca2b0ed030ab3c19210cd933875c52c9ed3d (diff) | |
| download | FreeBSD-src-e07cc0214a55c667871ff33ceb54311ec000283e.zip FreeBSD-src-e07cc0214a55c667871ff33ceb54311ec000283e.tar.gz | |
Resolve conflicts after import of OpenSSL 0.9.8b.
Diffstat (limited to 'crypto/openssl/ssl/s2_meth.c')
| -rw-r--r-- | crypto/openssl/ssl/s2_meth.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/crypto/openssl/ssl/s2_meth.c b/crypto/openssl/ssl/s2_meth.c index 8b6cbd0..a35e435 100644 --- a/crypto/openssl/ssl/s2_meth.c +++ b/crypto/openssl/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 |
