Bug 206926: 1. Undo the changes to secrng.h, pqgutil.h, swfutl.c,

unix_rand.c, and win_rand.c. 2. Make secrng.h and pqgutil.h private.
3. Public header pk11pqg.h can't include private header pqgutil.h.
4. Many files don't need to include secrng.h.  A few don't need to include
pqgutil.h.  5. Remove duplicate declarations of PQG_DestroyParams and
PQG_DestroyVerify from blapi.h.

28 files changed, 9 insertions, 53 deletions

diff --git a/security/nss/cmd/SSLsample/server.c b/security/nss/cmd/SSLsample/server.c
index 08c20a5a4..1cc364e3a 100644
--- a/security/nss/cmd/SSLsample/server.c
+++ b/security/nss/cmd/SSLsample/server.c
@@ -55,7 +55,6 @@
 #include "ssl.h"
 #include "certt.h"
 #include "nss.h"
-#include "secrng.h"
 #include "secder.h"
 #include "key.h"
 #include "sslproto.h"
diff --git a/security/nss/cmd/SSLsample/sslsample.h b/security/nss/cmd/SSLsample/sslsample.h
index ca6b6a489..d33f0b66d 100644
--- a/security/nss/cmd/SSLsample/sslsample.h
+++ b/security/nss/cmd/SSLsample/sslsample.h
@@ -52,7 +52,6 @@
 #include "ssl.h"
 #include "certt.h"
 #include "nss.h"
-#include "secrng.h"
 #include "secder.h"
 #include "key.h"
 #include "sslproto.h"
diff --git a/security/nss/cmd/certcgi/certcgi.c b/security/nss/cmd/certcgi/certcgi.c
index c67c3da9a..3e66a243f 100644
--- a/security/nss/cmd/certcgi/certcgi.c
+++ b/security/nss/cmd/certcgi/certcgi.c
@@ -49,7 +49,6 @@
 #include "secutil.h"
 #include "pk11pqg.h"
 #include "certxutl.h"
-#include "secrng.h"	/* for RNG_ */
 #include "nss.h"
 
 
diff --git a/security/nss/cmd/certutil/keystuff.c b/security/nss/cmd/certutil/keystuff.c
index 317443a27..901b64fc4 100644
--- a/security/nss/cmd/certutil/keystuff.c
+++ b/security/nss/cmd/certutil/keystuff.c
@@ -60,8 +60,6 @@ extern char *sys_errlist[];
 #include "prlong.h"
 
 #include "pk11func.h"
-#include "secrng.h"
-#include "pqgutil.h"
 
 #define NUM_KEYSTROKES 120
 #define RAND_BUF_SIZE 60
diff --git a/security/nss/cmd/lib/seccnames.c b/security/nss/cmd/lib/seccnames.c
index a1857dc0e..9bb1bef70 100644
--- a/security/nss/cmd/lib/seccnames.c
+++ b/security/nss/cmd/lib/seccnames.c
@@ -44,7 +44,6 @@
 
 #include "secutil.h"
 #include "secpkcs7.h"
-#include "secrng.h"
 #if !defined(_WIN32_WCE)
 #include <sys/stat.h>
 #endif
diff --git a/security/nss/cmd/lib/secutil.c b/security/nss/cmd/lib/secutil.c
index 93a329138..9773f9540 100644
--- a/security/nss/cmd/lib/secutil.c
+++ b/security/nss/cmd/lib/secutil.c
@@ -45,7 +45,6 @@
 
 #include "secutil.h"
 #include "secpkcs7.h"
-#include "secrng.h"
 #include <stdarg.h>
 #if !defined(_WIN32_WCE)
 #include <sys/stat.h>
diff --git a/security/nss/cmd/makepqg/makepqg.c b/security/nss/cmd/makepqg/makepqg.c
index 028ef7259..d2ec1f6f1 100644
--- a/security/nss/cmd/makepqg/makepqg.c
+++ b/security/nss/cmd/makepqg/makepqg.c
@@ -40,8 +40,6 @@
 #include "secitem.h"
 #include "pk11func.h"
 #include "pk11pqg.h"
-#include "pqgutil.h"
-#include "secrng.h"
 
 #if defined(XP_UNIX)
 #include <unistd.h>
diff --git a/security/nss/cmd/modutil/modutil.c b/security/nss/cmd/modutil/modutil.c
index ba67ffa3c..a756840e0 100644
--- a/security/nss/cmd/modutil/modutil.c
+++ b/security/nss/cmd/modutil/modutil.c
@@ -34,7 +34,6 @@
 #include "modutil.h"
 #include "install.h"
 #include <plstr.h>
-#include "secrng.h"
 #include "certdb.h" /* for CERT_DB_FILE_VERSION */
 #include "nss.h"
 
diff --git a/security/nss/cmd/sdrtest/sdrtest.c b/security/nss/cmd/sdrtest/sdrtest.c
index 5bcdd4cde..d54e6b5fc 100644
--- a/security/nss/cmd/sdrtest/sdrtest.c
+++ b/security/nss/cmd/sdrtest/sdrtest.c
@@ -46,7 +46,6 @@
 
 #include "plgetopt.h"
 #include "pk11sdr.h"
-#include "secrng.h"
 
 #define DEFAULT_VALUE "Test"
 
diff --git a/security/nss/cmd/shlibsign/shlibsign.c b/security/nss/cmd/shlibsign/shlibsign.c
index 6d4af89b4..3024a025a 100644
--- a/security/nss/cmd/shlibsign/shlibsign.c
+++ b/security/nss/cmd/shlibsign/shlibsign.c
@@ -50,7 +50,6 @@
 
 #include "plgetopt.h"
 #include "pk11sdr.h"
-#include "secrng.h"
 #include "shsign.h"
 #include "pk11pqg.h"
 
diff --git a/security/nss/cmd/swfort/newuser/newuser.c b/security/nss/cmd/swfort/newuser/newuser.c
index 33b6b853a..c1b5c311b 100644
--- a/security/nss/cmd/swfort/newuser/newuser.c
+++ b/security/nss/cmd/swfort/newuser/newuser.c
@@ -46,7 +46,6 @@
 #include "nss.h"
 #include "swforti.h"
 #include "secutil.h"
-#include "secrng.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0
diff --git a/security/nss/cmd/vfyserv/vfyserv.h b/security/nss/cmd/vfyserv/vfyserv.h
index e23b5e779..ad856e760 100644
--- a/security/nss/cmd/vfyserv/vfyserv.h
+++ b/security/nss/cmd/vfyserv/vfyserv.h
@@ -52,7 +52,6 @@
 #include "ssl.h"
 #include "certt.h"
 #include "nss.h"
-#include "secrng.h"
 #include "secder.h"
 #include "key.h"
 #include "sslproto.h"
diff --git a/security/nss/lib/cryptohi/seckey.c b/security/nss/lib/cryptohi/seckey.c
index fa80fe344..034376019 100644
--- a/security/nss/lib/cryptohi/seckey.c
+++ b/security/nss/lib/cryptohi/seckey.c
@@ -37,7 +37,6 @@
  */
 #include "cryptohi.h"
 #include "keyhi.h"
-#include "secrng.h"
 #include "secoid.h"
 #include "secitem.h"
 #include "secder.h"
diff --git a/security/nss/lib/fortcrypt/swfort/swfutl.c b/security/nss/lib/fortcrypt/swfort/swfutl.c
index 70b605dc9..eee677f65 100644
--- a/security/nss/lib/fortcrypt/swfort/swfutl.c
+++ b/security/nss/lib/fortcrypt/swfort/swfutl.c
@@ -43,7 +43,6 @@
 /* #include "dh.h" */
 #include "maci.h"
 #include "secport.h"
-#include "blapi.h"
 #include "secrng.h"
 #ifdef XP_OS2
 #include <sys/stat.h>
diff --git a/security/nss/lib/freebl/blapi.h b/security/nss/lib/freebl/blapi.h
index b1d8111bd..367f6ca1f 100644
--- a/security/nss/lib/freebl/blapi.h
+++ b/security/nss/lib/freebl/blapi.h
@@ -976,16 +976,6 @@ extern SECStatus   PQG_VerifyParams(const PQGParams *params,
  */
 extern void BL_Cleanup(void);
 
-/**************************************************************************
- *  Free the PQGParams struct and the things it points to.                *
- **************************************************************************/
-extern void PQG_DestroyParams(PQGParams *params);
-
-/**************************************************************************
- *  Free the PQGVerify struct and the things it points to.                *
- **************************************************************************/
-extern void PQG_DestroyVerify(PQGVerify *vfy);
-
 
 /**************************************************************************
  *  Verify a given Shared library signature                               *
diff --git a/security/nss/lib/freebl/loader.c b/security/nss/lib/freebl/loader.c
index 74687f24c..f853d4dd4 100644
--- a/security/nss/lib/freebl/loader.c
+++ b/security/nss/lib/freebl/loader.c
@@ -939,23 +939,6 @@ PQG_VerifyParams(const PQGParams *params, const PQGVerify *vfy,
       return SECFailure;
   return (vector->p_PQG_VerifyParams)(params, vfy, result);
 }
-#if 0
-void 
-PQG_DestroyParams(PQGParams *params)
-{
-  if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
-      return;
-  (vector->p_PQG_DestroyParams)( params);
-}
-
-void 
-PQG_DestroyVerify(PQGVerify *vfy)
-{
-  if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
-      return;
-  (vector->p_PQG_DestroyVerify)( vfy);
-}
-#endif
 
 void 
 BL_Cleanup(void)
diff --git a/security/nss/lib/freebl/manifest.mn b/security/nss/lib/freebl/manifest.mn
index c901c1011..f31c0f8c6 100644
--- a/security/nss/lib/freebl/manifest.mn
+++ b/security/nss/lib/freebl/manifest.mn
@@ -58,13 +58,13 @@ REQUIRES =
 
 EXPORTS = \
 	blapit.h \
-	secrng.h \
 	shsign.h \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	blapi.h \
 	secmpi.h \
+	secrng.h \
 	ec.h \
 	$(NULL)
 
diff --git a/security/nss/lib/freebl/secrng.h b/security/nss/lib/freebl/secrng.h
index 8e0c77899..a7e9aed4a 100644
--- a/security/nss/lib/freebl/secrng.h
+++ b/security/nss/lib/freebl/secrng.h
@@ -46,7 +46,7 @@
 ** generator.
 */
 
-#include "blapit.h"
+#include "blapi.h"
 
 SEC_BEGIN_PROTOS
 
diff --git a/security/nss/lib/freebl/unix_rand.c b/security/nss/lib/freebl/unix_rand.c
index abacc7948..cd6726530 100644
--- a/security/nss/lib/freebl/unix_rand.c
+++ b/security/nss/lib/freebl/unix_rand.c
@@ -41,7 +41,6 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <assert.h>
-#include "blapi.h"
 #include "secrng.h"
 
 size_t RNG_FileUpdate(const char *fileName, size_t limit);
diff --git a/security/nss/lib/freebl/win_rand.c b/security/nss/lib/freebl/win_rand.c
index 66f69844a..bad0365cd 100644
--- a/security/nss/lib/freebl/win_rand.c
+++ b/security/nss/lib/freebl/win_rand.c
@@ -31,7 +31,6 @@
  * GPL.
  */
 
-#include "blapi.h"
 #include "secrng.h"
 #ifdef XP_WIN
 #include <windows.h>
diff --git a/security/nss/lib/nss/nssinit.c b/security/nss/lib/nss/nssinit.c
index b397f2425..dce2bed09 100644
--- a/security/nss/lib/nss/nssinit.c
+++ b/security/nss/lib/nss/nssinit.c
@@ -47,7 +47,6 @@
 #include "secmod.h"
 #include "secoid.h"
 #include "nss.h"
-#include "secrng.h"
 #include "pk11func.h"
 #include "secerr.h"
 #include "nssbase.h"
diff --git a/security/nss/lib/pk11wrap/pk11pqg.c b/security/nss/lib/pk11wrap/pk11pqg.c
index a779d6c74..2ca5175f9 100644
--- a/security/nss/lib/pk11wrap/pk11pqg.c
+++ b/security/nss/lib/pk11wrap/pk11pqg.c
@@ -39,6 +39,7 @@
 #include "secmodi.h"
 #include "pkcs11t.h"
 #include "pk11pqg.h"
+#include "pqgutil.h"
 #include "secerr.h"
 
 
diff --git a/security/nss/lib/pk11wrap/pk11pqg.h b/security/nss/lib/pk11wrap/pk11pqg.h
index 20becf821..7a79e5416 100644
--- a/security/nss/lib/pk11wrap/pk11pqg.h
+++ b/security/nss/lib/pk11wrap/pk11pqg.h
@@ -38,7 +38,6 @@
 #define  _PK11PQG_H_ 1
 
 #include "blapit.h"
-#include "pqgutil.h"
 
 SEC_BEGIN_PROTOS
 
diff --git a/security/nss/lib/smime/cmsencode.c b/security/nss/lib/smime/cmsencode.c
index 978f02a55..3695978cf 100644
--- a/security/nss/lib/smime/cmsencode.c
+++ b/security/nss/lib/smime/cmsencode.c
@@ -43,7 +43,6 @@
 #include "key.h"
 #include "secasn1.h"
 #include "secoid.h"
-#include "secrng.h"
 #include "secitem.h"
 #include "pk11func.h"
 #include "secerr.h"
diff --git a/security/nss/lib/softoken/dbinit.c b/security/nss/lib/softoken/dbinit.c
index 55b27ef3b..1dddb6035 100644
--- a/security/nss/lib/softoken/dbinit.c
+++ b/security/nss/lib/softoken/dbinit.c
@@ -43,7 +43,6 @@
 #include "pcertt.h"
 #include "lowkeyi.h"
 #include "pcert.h"
-#include "secrng.h"
 #include "cdbhdl.h"
 #include "pkcs11i.h"
 
diff --git a/security/nss/lib/softoken/pkcs11c.c b/security/nss/lib/softoken/pkcs11c.c
index 604071159..9db6b1c26 100644
--- a/security/nss/lib/softoken/pkcs11c.c
+++ b/security/nss/lib/softoken/pkcs11c.c
@@ -55,6 +55,7 @@
 #include "secitem.h"
 #include "secport.h"
 #include "blapi.h"
+#include "pqgutil.h"
 #include "pkcs11.h"
 #include "pkcs11i.h"
 #include "lowkeyi.h"
diff --git a/security/nss/lib/util/manifest.mn b/security/nss/lib/util/manifest.mn
index b7d9a00d2..5091a7fd6 100644
--- a/security/nss/lib/util/manifest.mn
+++ b/security/nss/lib/util/manifest.mn
@@ -43,7 +43,6 @@ EXPORTS = \
 	nssrwlk.h \
 	nssrwlkt.h \
 	portreg.h \
-	pqgutil.h \
 	secasn1.h \
 	secasn1t.h \
 	seccomon.h \
@@ -59,6 +58,10 @@ EXPORTS = \
 	watcomfx.h \
 	$(NULL)
 
+PRIVATE_EXPORTS = \
+	pqgutil.h \
+	$(NULL)
+
 CSRCS = \
 	quickder.c \
 	secdig.c \
diff --git a/security/nss/lib/util/pqgutil.h b/security/nss/lib/util/pqgutil.h
index d82ff5f6d..1ceb87803 100644
--- a/security/nss/lib/util/pqgutil.h
+++ b/security/nss/lib/util/pqgutil.h
@@ -33,7 +33,7 @@
 #ifndef _PQGUTIL_H_
 #define _PQGUTIL_H_ 1
 
-#include "blapit.h"
+#include "blapi.h"
 
 /**************************************************************************
  *  Return a pointer to a new PQGParams struct that is a duplicate of     *