feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Move globalRNG and co to ssl.c

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2020-10-16 17:33:28 +02:00
parent 2153009efa
commit 24030d5f32
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ssl.c
View File

@@ -4786,6 +4786,13 @@ int AddCA(WOLFSSL_CERT_MANAGER* cm, DerBuffer** pDer, int type, int verify)
#endif /* NO_SESSION_CACHE */ #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 WOLFSSL_ABI
int wolfSSL_Init(void) int wolfSSL_Init(void)
{ {
@@ -28331,12 +28338,6 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = {
(sizeof(wolfssl_object_info) / sizeof(*wolfssl_object_info)) (sizeof(wolfssl_object_info) / sizeof(*wolfssl_object_info))
const size_t wolfssl_object_info_sz = WOLFSSL_OBJECT_INFO_SZ; const size_t wolfssl_object_info_sz = WOLFSSL_OBJECT_INFO_SZ;
#endif #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) && \ #if defined(OPENSSL_EXTRA) && \
!defined(NO_RSA) && !defined(HAVE_USER_RSA) && !defined(HAVE_FAST_RSA) !defined(NO_RSA) && !defined(HAVE_USER_RSA) && !defined(HAVE_FAST_RSA)
WC_RNG* WOLFSSL_RSA_GetRNG(WOLFSSL_RSA *rsa, WC_RNG **tmpRNG, int *initTmpRng) WC_RNG* WOLFSSL_RSA_GetRNG(WOLFSSL_RSA *rsa, WC_RNG **tmpRNG, int *initTmpRng)

7
wolfssl/internal.h
View File

@@ -4380,13 +4380,6 @@ extern const WOLF_EC_NIST_NAME kNistCurves[];
#define kNistCurves_MAX_NAME_LEN 7 #define kNistCurves_MAX_NAME_LEN 7
#endif #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 */ /* internal functions */
WOLFSSL_LOCAL int SendChangeCipher(WOLFSSL*); WOLFSSL_LOCAL int SendChangeCipher(WOLFSSL*);
WOLFSSL_LOCAL int SendTicket(WOLFSSL*); WOLFSSL_LOCAL int SendTicket(WOLFSSL*);