diff options
author | 2003-05-12 02:18:34 +0000 | |
---|---|---|
committer | 2003-05-12 02:18:34 +0000 | |
commit | 767fe2ff93c41790f9195ca310f4dfd4596a3448 (patch) | |
tree | 1a41fed2bee42d987049c11dfe3193ec916bd858 /lib/libssl/t1_meth.c | |
parent | Adaptive timeout value scaling. Allows to reduce timeout values as the (diff) | |
download | wireguard-openbsd-767fe2ff93c41790f9195ca310f4dfd4596a3448.tar.xz wireguard-openbsd-767fe2ff93c41790f9195ca310f4dfd4596a3448.zip |
merge 0.9.7b with local changes; crank majors for libssl/libcrypto
Diffstat (limited to 'lib/libssl/t1_meth.c')
-rw-r--r-- | lib/libssl/t1_meth.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/lib/libssl/t1_meth.c b/lib/libssl/t1_meth.c index 9bb36a7d1ca..fcc243f7826 100644 --- a/lib/libssl/t1_meth.c +++ b/lib/libssl/t1_meth.c @@ -76,13 +76,21 @@ SSL_METHOD *TLSv1_method(void) if (init) { - 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; + CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD); + + if (init) + { + 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; + } + + CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD); } + return(&TLSv1_data); } |