Remove the dual-callback scheme for numeric and pointer thread IDs,

[openssl.git] / crypto / rsa / rsa_eay.c

diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c
index 7f58a8989107ca39824e1f939960aa119db077da..7321349237cbc732c8a5e651dfe71689a315a7d6 100644 (file)
--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -263,10 +263,9 @@ err:
 static BN_BLINDING *rsa_get_blinding(RSA *rsa, int *local, BN_CTX *ctx)
 {
        BN_BLINDING *ret;
-       CRYPTO_THREADID tid;
        int got_write_lock = 0;
+       CRYPTO_THREADID cur;
 
-       CRYPTO_THREADID_set(&tid);
        CRYPTO_r_lock(CRYPTO_LOCK_RSA);
 
        if (rsa->blinding == NULL)
@@ -283,7 +282,8 @@ static BN_BLINDING *rsa_get_blinding(RSA *rsa, int *local, BN_CTX *ctx)
        if (ret == NULL)
                goto err;
 
-       if (!BN_BLINDING_cmp_thread(ret, &tid))
+       CRYPTO_THREADID_current(&cur);
+       if (!CRYPTO_THREADID_cmp(&cur, BN_BLINDING_thread_id(ret)))
                {
                /* rsa->blinding is ours! */