crypto/aes/asm/aes-s390x.pl: replace decrypt flag by macro.

[openssl.git] / crypto / threads_pthread.c

diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index 3f8ada2c370c4843bce53ef0208fb0dfc4a1d0a4..3aeef21668b93aaa4fa830cf8a8f0863a720032d 100644 (file)
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -177,7 +177,7 @@ int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock)
         return 1;
     }
 # endif
-    if (!CRYPTO_THREAD_write_lock(lock))
+    if (!CRYPTO_THREAD_read_lock(lock))
         return 0;
 
     *ret  = *val;
@@ -188,6 +188,25 @@ int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock)
     return 1;
 }
 
+int CRYPTO_atomic_write(int *val, int n, CRYPTO_RWLOCK *lock)
+{
+# if defined(__GNUC__) && defined(__ATOMIC_RELEASE)
+    if (__atomic_is_lock_free(sizeof(*val), val)) {
+        __atomic_store(val, &n, __ATOMIC_RELEASE);
+        return 1;
+    }
+# endif
+    if (!CRYPTO_THREAD_write_lock(lock))
+        return 0;
+
+    *val = n;
+
+    if (!CRYPTO_THREAD_unlock(lock))
+        return 0;
+
+    return 1;
+}
+
 # ifdef OPENSSL_SYS_UNIX
 static pthread_once_t fork_once_control = PTHREAD_ONCE_INIT;