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.

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"

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"

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"
 
 

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

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

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>

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>

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"
 

security/nss/cmd/sdrtest/sdrtest.c

@@ -34,7 +34,7 @@
 /*
  * Test program for SDR (Secret Decoder Ring) functions.
  *
- * $Id: sdrtest.c,v 1.10 2003/04/01 22:03:07 wtc%netscape.com Exp $
+ * $Id: sdrtest.c,v 1.11 2003/05/30 23:31:05 wtc%netscape.com Exp $
  */
 
 #include "nspr.h"
@@ -46,7 +46,6 @@
 
 #include "plgetopt.h"
 #include "pk11sdr.h"
-#include "secrng.h"
 
 #define DEFAULT_VALUE "Test"
 

security/nss/cmd/shlibsign/shlibsign.c

@@ -34,7 +34,7 @@
 /*
  * Test program for SDR (Secret Decoder Ring) functions.
  *
- * $Id: shlibsign.c,v 1.11 2003/04/01 22:47:46 wtc%netscape.com Exp $
+ * $Id: shlibsign.c,v 1.12 2003/05/30 23:31:07 wtc%netscape.com Exp $
  */
 
 #ifdef XP_UNIX
@@ -50,7 +50,6 @@
 
 #include "plgetopt.h"
 #include "pk11sdr.h"
-#include "secrng.h"
 #include "shsign.h"
 #include "pk11pqg.h"
 

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

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"

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"

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>

security/nss/lib/freebl/blapi.h

@@ -36,7 +36,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: blapi.h,v 1.15 2003/02/27 01:31:11 nelsonb%netscape.com Exp $
+ * $Id: blapi.h,v 1.16 2003/05/30 23:31:18 wtc%netscape.com Exp $
  */
 
 #ifndef _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                               *

security/nss/lib/freebl/loader.c

@@ -36,7 +36,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: loader.c,v 1.15 2003/03/18 03:24:59 nelsonb%netscape.com Exp $
+ * $Id: loader.c,v 1.16 2003/05/30 23:31:19 wtc%netscape.com Exp $
  */
 
 #include "loader.h"
@@ -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)

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)
 

security/nss/lib/freebl/secrng.h

@@ -37,7 +37,7 @@
  * secrng.h - public data structures and prototypes for the secure random
  *	      number generator
  *
- * $Id: secrng.h,v 1.3 2003/05/24 03:34:53 wtc%netscape.com Exp $
+ * $Id: secrng.h,v 1.4 2003/05/30 23:31:19 wtc%netscape.com Exp $
  */
 
 /******************************************/
@@ -46,7 +46,7 @@
 ** generator.
 */
 
-#include "blapit.h"
+#include "blapi.h"
 
 SEC_BEGIN_PROTOS
 

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);

security/nss/lib/freebl/win_rand.c

@@ -31,7 +31,6 @@
  * GPL.
  */
 
-#include "blapi.h"
 #include "secrng.h"
 #ifdef XP_WIN
 #include <windows.h>

security/nss/lib/nss/nssinit.c

@@ -32,7 +32,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- # $Id: nssinit.c,v 1.63 2003/05/30 17:25:13 kirk.erickson%sun.com Exp $
+ # $Id: nssinit.c,v 1.64 2003/05/30 23:31:22 wtc%netscape.com Exp $
  */
 
 #include <ctype.h>
@@ -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"

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"
 
 

security/nss/lib/pk11wrap/pk11pqg.h

@@ -38,7 +38,6 @@
 #define  _PK11PQG_H_ 1
 
 #include "blapit.h"
-#include "pqgutil.h"
 
 SEC_BEGIN_PROTOS
 

security/nss/lib/smime/cmsencode.c

@@ -34,7 +34,7 @@
 /*
  * CMS encoding.
  *
- * $Id: cmsencode.c,v 1.3 2001/09/20 22:15:32 relyea%netscape.com Exp $
+ * $Id: cmsencode.c,v 1.4 2003/05/30 23:31:27 wtc%netscape.com Exp $
  */
 
 #include "cmslocal.h"
@@ -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"

security/nss/lib/softoken/dbinit.c

@@ -32,7 +32,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- # $Id: dbinit.c,v 1.19 2002/11/11 22:00:02 relyea%netscape.com Exp $
+ # $Id: dbinit.c,v 1.20 2003/05/30 23:31:30 wtc%netscape.com Exp $
  */
 
 #include <ctype.h>
@@ -43,7 +43,6 @@
 #include "pcertt.h"
 #include "lowkeyi.h"
 #include "pcert.h"
-#include "secrng.h"
 #include "cdbhdl.h"
 #include "pkcs11i.h"
 

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"

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 \

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     *