From 24030d5f32315137081cfc85e67ddf9d7e369059 Mon Sep 17 00:00:00 2001
From: Juliusz Sosinowicz <juliusz@wolfssl.com>
Date: Fri, 16 Oct 2020 17:33:28 +0200
Subject: [PATCH] Move globalRNG and co to ssl.c

---
 src/ssl.c          | 13 +++++++------
 wolfssl/internal.h |  7 -------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/ssl.c b/src/ssl.c
index 021b43601..772bd394a 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -4786,6 +4786,13 @@ int AddCA(WOLFSSL_CERT_MANAGER* cm, DerBuffer** pDer, int type, int verify)
 
 #endif /* NO_SESSION_CACHE */
 
+#if defined(OPENSSL_EXTRA) || \
+    (defined(OPENSSL_EXTRA_X509_SMALL) && !defined(NO_RSA))
+static WC_RNG globalRNG;
+static int initGlobalRNG = 0;
+static wolfSSL_Mutex globalRNGMutex;
+#endif
+
 WOLFSSL_ABI
 int wolfSSL_Init(void)
 {
@@ -28331,12 +28338,6 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = {
                 (sizeof(wolfssl_object_info) / sizeof(*wolfssl_object_info))
 const size_t wolfssl_object_info_sz = WOLFSSL_OBJECT_INFO_SZ;
 #endif
-#if defined(OPENSSL_EXTRA) || \
-    (defined(OPENSSL_EXTRA_X509_SMALL) && !defined(NO_RSA))
-WC_RNG globalRNG;
-int initGlobalRNG = 0;
-wolfSSL_Mutex globalRNGMutex;
-#endif
 #if defined(OPENSSL_EXTRA) && \
     !defined(NO_RSA) && !defined(HAVE_USER_RSA) && !defined(HAVE_FAST_RSA)
 WC_RNG* WOLFSSL_RSA_GetRNG(WOLFSSL_RSA *rsa, WC_RNG **tmpRNG, int *initTmpRng)
diff --git a/wolfssl/internal.h b/wolfssl/internal.h
index fc47bb408..db1b5d176 100644
--- a/wolfssl/internal.h
+++ b/wolfssl/internal.h
@@ -4380,13 +4380,6 @@ extern const WOLF_EC_NIST_NAME kNistCurves[];
 #define kNistCurves_MAX_NAME_LEN 7
 #endif
 
-#if defined(OPENSSL_EXTRA) || \
-    (defined(OPENSSL_EXTRA_X509_SMALL) && !defined(NO_RSA))
-extern WC_RNG globalRNG;
-extern int initGlobalRNG;
-extern wolfSSL_Mutex globalRNGMutex;
-#endif
-
 /* internal functions */
 WOLFSSL_LOCAL int SendChangeCipher(WOLFSSL*);
 WOLFSSL_LOCAL int SendTicket(WOLFSSL*);