diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2016-02-29 17:26:07 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-08 18:48:38 -0500 |
| commit | 16203f7b71bd343550f89f266eaf9fb9693f6148 (patch) | |
| tree | 08a0080d1a26dc6db34c0c28387c99da44744de1 /include | |
| parent | be1251f73def8169b98d53430b631df13d430dbc (diff) | |
Convert CRYPTO_LOCK_SSL_* to new multi-threading API
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/crypto.h | 7 | ||||
| -rw-r--r-- | include/openssl/ssl.h | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index cfda8bb214..3f9ce2b442 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -166,15 +166,8 @@ extern "C" { */ # define CRYPTO_LOCK_X509_STORE 11 -# define CRYPTO_LOCK_SSL_CTX 12 -# define CRYPTO_LOCK_SSL_CERT 13 -# define CRYPTO_LOCK_SSL_SESSION 14 -# define CRYPTO_LOCK_SSL_SESS_CERT 15 -# define CRYPTO_LOCK_SSL 16 -# define CRYPTO_LOCK_SSL_METHOD 17 # define CRYPTO_LOCK_RAND 18 # define CRYPTO_LOCK_RAND2 19 -# define CRYPTO_LOCK_READDIR 24 # define CRYPTO_LOCK_RSA_BLINDING 25 # define CRYPTO_LOCK_DYNLOCK 29 # define CRYPTO_LOCK_ENGINE 30 diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index be2ca2ab37..adfad4c369 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1499,6 +1499,7 @@ int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *ses); # endif int SSL_SESSION_print(BIO *fp, const SSL_SESSION *ses); int SSL_SESSION_print_keylog(BIO *bp, const SSL_SESSION *x); +int SSL_SESSION_up_ref(SSL_SESSION *ses); void SSL_SESSION_free(SSL_SESSION *ses); __owur int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp); __owur int SSL_set_session(SSL *to, SSL_SESSION *session); |