Remove OPENSSL_assert() from crypto/threads_none.c

[openssl.git] / crypto / threads_none.c

diff --git a/crypto/threads_none.c b/crypto/threads_none.c
index 72bf25b0d5ff52a1c93e0fe27aaa143b4a22efb3..ffad7576b171000b4802f5cdc9642cf7d2a75330 100644 (file)
--- a/crypto/threads_none.c
+++ b/crypto/threads_none.c
@@ -8,6 +8,7 @@
  */
 
 #include <openssl/crypto.h>
  */
 
 #include <openssl/crypto.h>

+#include "internal/cryptlib.h"

 
 #if !defined(OPENSSL_THREADS) || defined(CRYPTO_TDEBUG)
 
 
 #if !defined(OPENSSL_THREADS) || defined(CRYPTO_TDEBUG)
 


@@ -24,19 +25,22 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
 
 int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock)
 {
 
 int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock)
 {

-    OPENSSL_assert(*(unsigned int *)lock == 1);
+    if (!ossl_assert(*(unsigned int *)lock == 1))
+        return 0;

     return 1;
 }
 
 int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock)
 {
     return 1;
 }
 
 int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock)
 {

-    OPENSSL_assert(*(unsigned int *)lock == 1);
+    if (!ossl_assert(*(unsigned int *)lock == 1))
+        return 0;

     return 1;
 }
 
 int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
 {
     return 1;
 }
 
 int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
 {

-    OPENSSL_assert(*(unsigned int *)lock == 1);
+    if (!ossl_assert(*(unsigned int *)lock == 1))
+        return 0;

     return 1;
 }
 
     return 1;
 }
 


@@ -121,4 +125,9 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
     return 1;
 }
 
     return 1;
 }
 

+int openssl_init_fork_handlers(void)
+{
+    return 0;
+}
+

 #endif
 #endif