summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAlessandro Ghedini <alessandro@ghedini.me>2016-03-08 22:37:01 +0000
committerAlessandro Ghedini <alessandro@ghedini.me>2016-03-08 23:52:48 +0000
commit0b1a07c8a70486534526d8967f03e32806da5661 (patch)
tree973c6ac96312d6e14adfeaecfd053f7f1fd76a04 /include
parent16203f7b71bd343550f89f266eaf9fb9693f6148 (diff)
Convert RSA blinding 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/bn.h11
-rw-r--r--include/openssl/crypto.h1
2 files changed, 6 insertions, 6 deletions
diff --git a/include/openssl/bn.h b/include/openssl/bn.h
index db01b7e3b4..8d2d5a8be0 100644
--- a/include/openssl/bn.h
+++ b/include/openssl/bn.h
@@ -431,11 +431,12 @@ int BN_BLINDING_invert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
int BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *);
int BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b,
BN_CTX *);
-DEPRECATEDIN_1_0_0(unsigned long
- BN_BLINDING_get_thread_id(const BN_BLINDING *))
-DEPRECATEDIN_1_0_0(void
- BN_BLINDING_set_thread_id(BN_BLINDING *, unsigned long))
-CRYPTO_THREADID *BN_BLINDING_thread_id(BN_BLINDING *);
+
+int BN_BLINDING_is_current_thread(BN_BLINDING *b);
+void BN_BLINDING_set_current_thread(BN_BLINDING *b);
+int BN_BLINDING_lock(BN_BLINDING *b);
+int BN_BLINDING_unlock(BN_BLINDING *b);
+
unsigned long BN_BLINDING_get_flags(const BN_BLINDING *);
void BN_BLINDING_set_flags(BN_BLINDING *, unsigned long);
BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 3f9ce2b442..d010bfae11 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -168,7 +168,6 @@ extern "C" {
# define CRYPTO_LOCK_X509_STORE 11
# define CRYPTO_LOCK_RAND 18
# define CRYPTO_LOCK_RAND2 19
-# define CRYPTO_LOCK_RSA_BLINDING 25
# define CRYPTO_LOCK_DYNLOCK 29
# define CRYPTO_LOCK_ENGINE 30
# define CRYPTO_LOCK_ECDSA 32