Make the global DRBGs static

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
GH: #4268

diff --git a/crypto/rand/drbg_lib.c b/crypto/rand/drbg_lib.c
index 3690976051b5991c65a6296479861f45153cda53..83ddc27ee5a9f8225a350accb1a828045269c3b1 100644 (file)
--- a/crypto/rand/drbg_lib.c
+++ b/crypto/rand/drbg_lib.c
@@ -15,6 +15,9 @@
 #include "internal/thread_once.h"
 #include "internal/rand_int.h"
 
+static RAND_DRBG rand_drbg; /* The default global DRBG. */
+static RAND_DRBG priv_drbg; /* The global private-key DRBG. */
+
 /*
  * Support framework for NIST SP 800-90A DRBG, AES-CTR mode.
  * The RAND_DRBG is OpenSSL's pointer to an instance of the DRBG.
@@ -473,9 +476,6 @@ RAND_DRBG *RAND_DRBG_get0_priv_global(void)
     return &priv_drbg;
 }
 
-RAND_DRBG rand_drbg; /* The default global DRBG. */
-RAND_DRBG priv_drbg; /* The global private-key DRBG. */
-
 RAND_METHOD rand_meth = {
     drbg_seed,
     drbg_bytes,

diff --git a/crypto/rand/rand_lcl.h b/crypto/rand/rand_lcl.h
index f9de2796582930e1211ebc96257cc748af1a1821..498b7e687e2a9e2d48783d364373fb5c0e90ba4c 100644 (file)
--- a/crypto/rand/rand_lcl.h
+++ b/crypto/rand/rand_lcl.h
@@ -144,8 +144,6 @@ struct rand_drbg_st {
 /* The global RAND method, and the global buffer and DRBG instance. */
 extern RAND_METHOD rand_meth;
 extern RAND_BYTES_BUFFER rand_bytes;
-extern RAND_DRBG rand_drbg;
-extern RAND_DRBG priv_drbg;
 
 /* How often we've forked (only incremented in child). */
 extern int rand_fork_count;