Unify all assembler file generators

[openssl.git] / crypto / threads_none.c

diff --git a/crypto/threads_none.c b/crypto/threads_none.c
index 30ed4e6999cc6c1fbae8fa35d682468e7ab5513f..c12d5610aae1e6bcb69037727a5bd3e96102a9d6 100644 (file)
--- a/crypto/threads_none.c
+++ b/crypto/threads_none.c
@@ -1,7 +1,7 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
@@ -12,11 +12,19 @@
 
 #if !defined(OPENSSL_THREADS) || defined(CRYPTO_TDEBUG)
 
+# if defined(OPENSSL_SYS_UNIX)
+#  include <sys/types.h>
+#  include <unistd.h>
+# endif
+
 CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
 {
-    CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(unsigned int));
-    if (lock == NULL)
+    CRYPTO_RWLOCK *lock;
+
+    if ((lock = OPENSSL_zalloc(sizeof(unsigned int))) == NULL) {
+        /* Don't set error, to avoid recursion blowup. */
         return NULL;
+    }
 
     *(unsigned int *)lock = 1;
 
@@ -125,21 +133,17 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
     return 1;
 }
 
-int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock)
-{
-    *ret = *val;
-    return 1;
-}
-
-int CRYPTO_atomic_write(int *val, int n, CRYPTO_RWLOCK *lock)
+int openssl_init_fork_handlers(void)
 {
-    *val = n;
-    return 1;
+    return 0;
 }
 
-int openssl_init_fork_handlers(void)
+int openssl_get_fork_id(void)
 {
+# if defined(OPENSSL_SYS_UNIX)
+    return getpid();
+# else
     return 0;
+# endif
 }
-
 #endif