Skip to content

Commit

Permalink
Bug 206926: 1. Undo the changes to secrng.h, pqgutil.h, swfutl.c,
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
wtc%netscape.com committed May 30, 2003
1 parent 654b573 commit 45a3d98
Show file tree
Hide file tree
Showing 28 changed files with 9 additions and 53 deletions.
1 change: 0 additions & 1 deletion security/nss/cmd/SSLsample/server.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion security/nss/cmd/SSLsample/sslsample.h
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion security/nss/cmd/certcgi/certcgi.c
View file
Expand Up @@ -49,7 +49,6 @@
#include "secutil.h"
#include "pk11pqg.h"
#include "certxutl.h"
#include "secrng.h" /* for RNG_ */
#include "nss.h"


Expand Down
2 changes: 0 additions & 2 deletions security/nss/cmd/certutil/keystuff.c
View file
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion security/nss/cmd/lib/seccnames.c
View file
Expand Up @@ -44,7 +44,6 @@

#include "secutil.h"
#include "secpkcs7.h"
#include "secrng.h"
#if !defined(_WIN32_WCE)
#include <sys/stat.h>
#endif
Expand Down
1 change: 0 additions & 1 deletion security/nss/cmd/lib/secutil.c
View file
Expand Up @@ -45,7 +45,6 @@

#include "secutil.h"
#include "secpkcs7.h"
#include "secrng.h"
#include <stdarg.h>
#if !defined(_WIN32_WCE)
#include <sys/stat.h>
Expand Down
2 changes: 0 additions & 2 deletions security/nss/cmd/makepqg/makepqg.c
View file
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion security/nss/cmd/modutil/modutil.c
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion security/nss/cmd/sdrtest/sdrtest.c
View file
Expand Up @@ -46,7 +46,6 @@

#include "plgetopt.h"
#include "pk11sdr.h"
#include "secrng.h"

#define DEFAULT_VALUE "Test"

Expand Down
1 change: 0 additions & 1 deletion security/nss/cmd/shlibsign/shlibsign.c
View file
Expand Up @@ -50,7 +50,6 @@

#include "plgetopt.h"
#include "pk11sdr.h"
#include "secrng.h"
#include "shsign.h"
#include "pk11pqg.h"

Expand Down
1 change: 0 additions & 1 deletion security/nss/cmd/swfort/newuser/newuser.c
View file
Expand Up @@ -46,7 +46,6 @@
#include "nss.h"
#include "swforti.h"
#include "secutil.h"
#include "secrng.h"

#ifndef O_BINARY
#define O_BINARY 0
Expand Down
1 change: 0 additions & 1 deletion security/nss/cmd/vfyserv/vfyserv.h
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion security/nss/lib/cryptohi/seckey.c
View file
Expand Up @@ -37,7 +37,6 @@
*/
#include "cryptohi.h"
#include "keyhi.h"
#include "secrng.h"
#include "secoid.h"
#include "secitem.h"
#include "secder.h"
Expand Down
1 change: 0 additions & 1 deletion security/nss/lib/fortcrypt/swfort/swfutl.c
View file
Expand Up @@ -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>
Expand Down
10 changes: 0 additions & 10 deletions security/nss/lib/freebl/blapi.h
View file
Expand Up @@ -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 *
Expand Down
17 changes: 0 additions & 17 deletions security/nss/lib/freebl/loader.c
View file
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion security/nss/lib/freebl/manifest.mn
View file
Expand Up @@ -58,13 +58,13 @@ REQUIRES =

EXPORTS = \
blapit.h \
secrng.h \
shsign.h \
$(NULL)

PRIVATE_EXPORTS = \
blapi.h \
secmpi.h \
secrng.h \
ec.h \
$(NULL)

Expand Down
2 changes: 1 addition & 1 deletion security/nss/lib/freebl/secrng.h
View file
Expand Up @@ -46,7 +46,7 @@
** generator.
*/

#include "blapit.h"
#include "blapi.h"

SEC_BEGIN_PROTOS

Expand Down
1 change: 0 additions & 1 deletion security/nss/lib/freebl/unix_rand.c
View file
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion security/nss/lib/freebl/win_rand.c
View file
Expand Up @@ -31,7 +31,6 @@
* GPL.
*/

#include "blapi.h"
#include "secrng.h"
#ifdef XP_WIN
#include <windows.h>
Expand Down
1 change: 0 additions & 1 deletion security/nss/lib/nss/nssinit.c
View file
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions security/nss/lib/pk11wrap/pk11pqg.c
View file
Expand Up @@ -39,6 +39,7 @@
#include "secmodi.h"
#include "pkcs11t.h"
#include "pk11pqg.h"
#include "pqgutil.h"
#include "secerr.h"


Expand Down
1 change: 0 additions & 1 deletion security/nss/lib/pk11wrap/pk11pqg.h
View file
Expand Up @@ -38,7 +38,6 @@
#define _PK11PQG_H_ 1

#include "blapit.h"
#include "pqgutil.h"

SEC_BEGIN_PROTOS

Expand Down
1 change: 0 additions & 1 deletion security/nss/lib/smime/cmsencode.c
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion security/nss/lib/softoken/dbinit.c
View file
Expand Up @@ -43,7 +43,6 @@
#include "pcertt.h"
#include "lowkeyi.h"
#include "pcert.h"
#include "secrng.h"
#include "cdbhdl.h"
#include "pkcs11i.h"

Expand Down
1 change: 1 addition & 0 deletions security/nss/lib/softoken/pkcs11c.c
View file
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion security/nss/lib/util/manifest.mn
View file
Expand Up @@ -43,7 +43,6 @@ EXPORTS = \
nssrwlk.h \
nssrwlkt.h \
portreg.h \
pqgutil.h \
secasn1.h \
secasn1t.h \
seccomon.h \
Expand All @@ -59,6 +58,10 @@ EXPORTS = \
watcomfx.h \
$(NULL)

PRIVATE_EXPORTS = \
pqgutil.h \
$(NULL)

CSRCS = \
quickder.c \
secdig.c \
Expand Down
2 changes: 1 addition & 1 deletion security/nss/lib/util/pqgutil.h
View file
Expand Up @@ -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 *
Expand Down

0 comments on commit 45a3d98

Please sign in to comment.