diff options
| author | markm <markm@FreeBSD.org> | 2003-01-28 21:43:22 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2003-01-28 21:43:22 +0000 |
| commit | aad1d64cb5a8d9b503d9199642363dc1e92d2f9b (patch) | |
| tree | 610a51c6e3965764fb0f1629c1376e2d23afffe8 /crypto/openssl/ssl/t1_meth.c | |
| parent | eba366e36e93f5da8ae5c744eb337c3ef6872641 (diff) | |
| download | FreeBSD-src-aad1d64cb5a8d9b503d9199642363dc1e92d2f9b.zip FreeBSD-src-aad1d64cb5a8d9b503d9199642363dc1e92d2f9b.tar.gz | |
Vendor import of OpenSSL release 0.9.7. This release includes
support for AES and OpenBSD's hardware crypto.
Diffstat (limited to 'crypto/openssl/ssl/t1_meth.c')
| -rw-r--r-- | crypto/openssl/ssl/t1_meth.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/crypto/openssl/ssl/t1_meth.c b/crypto/openssl/ssl/t1_meth.c index 9bb36a7..fcc243f 100644 --- a/crypto/openssl/ssl/t1_meth.c +++ b/crypto/openssl/ssl/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); } |
