Convert CRYPTO_LOCK_{DH,DSA,RSA} to new multi-threading API

[openssl.git] / crypto / bn / bn_mont.c

diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c
index 90c718ba59137762904f04f2308a1fdf7a9c2a2c..dfa395afd667fd821240f9b50f5e1cf2765c2881 100644 (file)
--- a/crypto/bn/bn_mont.c
+++ b/crypto/bn/bn_mont.c
@@ -1,4 +1,3 @@
-/* crypto/bn/bn_mont.c */

 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *


@@ -497,14 +496,14 @@ BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to, BN_MONT_CTX *from)
     return (to);
 }
 
     return (to);
 }
 

-BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock,
+BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, CRYPTO_RWLOCK *lock,

                                     const BIGNUM *mod, BN_CTX *ctx)
 {
     BN_MONT_CTX *ret;
 
                                     const BIGNUM *mod, BN_CTX *ctx)
 {
     BN_MONT_CTX *ret;
 

-    CRYPTO_r_lock(lock);
+    CRYPTO_THREAD_read_lock(lock);

     ret = *pmont;
     ret = *pmont;

-    CRYPTO_r_unlock(lock);
+    CRYPTO_THREAD_unlock(lock);

     if (ret)
         return ret;
 
     if (ret)
         return ret;
 


@@ -525,12 +524,12 @@ BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock,
     }
 
     /* The locked compare-and-set, after the local work is done. */
     }
 
     /* The locked compare-and-set, after the local work is done. */

-    CRYPTO_w_lock(lock);
+    CRYPTO_THREAD_write_lock(lock);

     if (*pmont) {
         BN_MONT_CTX_free(ret);
         ret = *pmont;
     } else
         *pmont = ret;
     if (*pmont) {
         BN_MONT_CTX_free(ret);
         ret = *pmont;
     } else
         *pmont = ret;

-    CRYPTO_w_unlock(lock);
+    CRYPTO_THREAD_unlock(lock);

     return ret;
 }
     return ret;
 }