diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2016-02-26 12:21:15 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-08 11:10:34 -0500 |
| commit | 03273d61e742b02485831ce739e4a6c9b197e3f3 (patch) | |
| tree | 409404f29d10943739c95a0e2333d6431168434b /include | |
| parent | fb46be034816e5fe9f04fd39da960d34dbf2f52d (diff) | |
Convert CRYPTO_LOCK_EVP_PKEY 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 | 1 | ||||
| -rw-r--r-- | include/openssl/x509.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index a36d7175e1..4af6f72b0c 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -170,7 +170,6 @@ extern "C" { # define CRYPTO_LOCK_X509_PKEY 5 # define CRYPTO_LOCK_X509_CRL 6 # define CRYPTO_LOCK_X509_REQ 7 -# define CRYPTO_LOCK_EVP_PKEY 10 # define CRYPTO_LOCK_X509_STORE 11 # define CRYPTO_LOCK_SSL_CTX 12 # define CRYPTO_LOCK_SSL_CERT 13 diff --git a/include/openssl/x509.h b/include/openssl/x509.h index fc77886d20..294ab83b0e 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -133,6 +133,7 @@ struct X509_pubkey_st { X509_ALGOR *algor; ASN1_BIT_STRING *public_key; EVP_PKEY *pkey; + CRYPTO_RWLOCK *lock; }; typedef struct X509_sig_st { |