diff options
author | relyea%netscape.com <devnull@localhost> | 2000-09-20 21:28:31 +0000 |
---|---|---|
committer | relyea%netscape.com <devnull@localhost> | 2000-09-20 21:28:31 +0000 |
commit | 072df6536a8fea1c111c7c9f662083f7c2c39afa (patch) | |
tree | ee0fd1cf989517397f372261404d71ffd284597b | |
parent | aab772fb0aad1404ad411590be6a299e459a0bde (diff) | |
download | nss-hg-072df6536a8fea1c111c7c9f662083f7c2c39afa.tar.gz |
Use the new Database-less initialization.
-rw-r--r-- | security/nss/cmd/swfort/instinit/instinit.c | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/security/nss/cmd/swfort/instinit/instinit.c b/security/nss/cmd/swfort/instinit/instinit.c index 8f13bc450..c9be42b56 100644 --- a/security/nss/cmd/swfort/instinit/instinit.c +++ b/security/nss/cmd/swfort/instinit/instinit.c @@ -37,10 +37,8 @@ #include "swforti.h" #include "cert.h" #include "pk11func.h" -#include "secmod.h" -#include "secmodi.h" +#include "nss.h" #include "secutil.h" -#include "secrng.h" #include "cdbhdl.h" #define CERTDB_VALID_CA (1<<3) @@ -303,38 +301,7 @@ main(int argc, char ** argv) exit(1); } - /* now we want to verify the signature */ - /* Initialize the cert code */ - rv = CERT_OpenVolatileCertDB(&certhandle); - if (rv != SECSuccess) { - fprintf(stderr,"%s: Couldn't build temparary Cert Database.\n", - progname); - exit(1); - } - CERT_SetDefaultCertDB(&certhandle); - - RNG_RNGInit(); - PK11_InitSlotLists(); - - module = SECMOD_NewInternal(); - if (module == NULL) { - fprintf(stderr,"%s: Couldn't initialize security.\n", - progname); - exit(1); - } - rv = SECMOD_LoadModule(module); - if (rv != SECSuccess) { - fprintf(stderr,"%s: Couldn't initialize security.\n", - progname); - exit(1); - } - - /* - * This really shouldn't happen, but we aren't fully initializing the - * NSS code here, so we end up calling some internal functions to do - * some of this initialization. - */ - secmod_GetInternalModule(module); + NSS_NoDB_Init(NULL); sec_SetCheckKRLState(1); /* now dump the certs into the temparary data base */ |