diff options
author | cvs2hg <devnull@localhost> | 2000-07-10 20:38:54 +0000 |
---|---|---|
committer | cvs2hg <devnull@localhost> | 2000-07-10 20:38:54 +0000 |
commit | a015216ee28dff4db71ff7bd40b6f884bd7adb20 (patch) | |
tree | bb74af7eeeb38da1f40c0d9c57b61949960f3a38 /security/nss/lib/nss | |
parent | 812ded22d397b76e6fbe06265ac9e706342f7347 (diff) | |
parent | 95b7b658dddd086bcaa47ea4e445ebebfd944628 (diff) | |
download | nss-hg-a015216ee28dff4db71ff7bd40b6f884bd7adb20.tar.gz |
fixup commit for tag 'Netscape_20001107_RELEASE'Netscape_20001107_RELEASE
Diffstat (limited to 'security/nss/lib/nss')
-rw-r--r-- | security/nss/lib/nss/Makefile | 78 | ||||
-rw-r--r-- | security/nss/lib/nss/config.mk | 44 | ||||
-rw-r--r-- | security/nss/lib/nss/manifest.mn | 47 | ||||
-rw-r--r-- | security/nss/lib/nss/nss.h | 59 | ||||
-rw-r--r-- | security/nss/lib/nss/nssinit.c | 201 |
5 files changed, 0 insertions, 429 deletions
diff --git a/security/nss/lib/nss/Makefile b/security/nss/lib/nss/Makefile deleted file mode 100644 index 1a5c66ef4..000000000 --- a/security/nss/lib/nss/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/arch.mk - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### -include config.mk - - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - - diff --git a/security/nss/lib/nss/config.mk b/security/nss/lib/nss/config.mk deleted file mode 100644 index a73a1086e..000000000 --- a/security/nss/lib/nss/config.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -# -# Override TARGETS variable so that only static libraries -# are specifed as dependencies within rules.mk. -# - -TARGETS = $(LIBRARY) -SHARED_LIBRARY = -IMPORT_LIBRARY = -PURE_LIBRARY = -PROGRAM = - diff --git a/security/nss/lib/nss/manifest.mn b/security/nss/lib/nss/manifest.mn deleted file mode 100644 index 344a64b23..000000000 --- a/security/nss/lib/nss/manifest.mn +++ /dev/null @@ -1,47 +0,0 @@ -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# -CORE_DEPTH = ../../.. - -EXPORTS = \ - nss.h \ - $(NULL) - -MODULE = security - -CSRCS = \ - nssinit.c \ - $(NULL) - -REQUIRES = security dbm - -LIBRARY_NAME = nss diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h deleted file mode 100644 index 157f110e0..000000000 --- a/security/nss/lib/nss/nss.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * NSS utility functions - * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - * - * $Id$ - */ - -#ifndef __nss_h_ -#define __nss_h_ - -#include "seccomon.h" - -SEC_BEGIN_PROTOS -/* - * Open the Cert, Key, and Security Module databases. - * Initialize the Random Number Generator. - * Does not initialize the cipher policies or enables. - * Default policy settings disallow all ciphers. - */ -extern SECStatus NSS_Init(const char *configdir); - -/* - * Close the Cert, Key databases. - */ -extern void NSS_Shutdown(void); - -SEC_END_PROTOS - -#endif /* __nss_h_ */ diff --git a/security/nss/lib/nss/nssinit.c b/security/nss/lib/nss/nssinit.c deleted file mode 100644 index 92d009fc9..000000000 --- a/security/nss/lib/nss/nssinit.c +++ /dev/null @@ -1,201 +0,0 @@ -/* - * NSS utility functions - * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - * - # $Id$ - */ - -#include "seccomon.h" -#include "prprf.h" -#include "prmem.h" -#include "cert.h" -#include "key.h" -#include "ssl.h" -#include "sslproto.h" -#include "secmod.h" -#include "nss.h" -#include "secrng.h" -#include "cdbhdl.h" /* ??? */ - - - -static char * -nss_certdb_name_cb(void *arg, int dbVersion) -{ - const char *configdir = (const char *)arg; - const char *dbver; - - switch (dbVersion) { - case 7: - dbver = "7"; - break; - case 6: - dbver = "6"; - break; - case 5: - dbver = "5"; - break; - case 4: - default: - dbver = ""; - break; - } - - return PR_smprintf("%s/cert%s.db", configdir, dbver); -} - -char * -nss_keydb_name_cb(void *arg, int dbVersion) -{ - const char *configdir = (const char *)arg; - const char *dbver; - - switch (dbVersion) { - case 3: - dbver = "3"; - break; - case 2: - default: - dbver = ""; - break; - } - - return PR_smprintf("%s/key%s.db", configdir, dbver); -} - -SECStatus -nss_OpenCertDB(const char * configdir) -{ - CERTCertDBHandle *certdb; - SECStatus status; - - certdb = CERT_GetDefaultCertDB(); - if (certdb) - return SECSuccess; /* idempotency */ - - certdb = (CERTCertDBHandle*)PORT_ZAlloc(sizeof(CERTCertDBHandle)); - if (certdb == NULL) - goto loser; - - status = CERT_OpenCertDB(certdb, PR_TRUE, nss_certdb_name_cb, (void *)configdir); - if (status == SECSuccess) - CERT_SetDefaultCertDB(certdb); - else { - PR_Free(certdb); -loser: - status = SECFailure; - } - return status; -} - -SECStatus -nss_OpenKeyDB(const char * configdir) -{ - SECKEYKeyDBHandle *keydb; - - keydb = SECKEY_GetDefaultKeyDB(); - if (keydb) - return SECSuccess; - keydb = SECKEY_OpenKeyDB(PR_TRUE, nss_keydb_name_cb, (void *)configdir); - if (keydb == NULL) - return SECFailure; - SECKEY_SetDefaultKeyDB(keydb); - return SECSuccess; -} - -SECStatus -nss_OpenSecModDB(const char * configdir) -{ - static char *secmodname; - - /* XXX - * For idempotency, this should check to see if the secmodDB is alredy open - * but no function exists to make that determination. - */ - if (secmodname) - return SECSuccess; - secmodname = PR_smprintf("%s/secmod.db", configdir); - if (secmodname == NULL) - return SECFailure; - SECMOD_init(secmodname); - return SECSuccess; -} - -SECStatus -NSS_Init(const char *configdir) -{ - SECStatus status; - SECStatus rv = SECFailure; - - RNG_RNGInit(); /* initialize random number generator */ - RNG_SystemInfoForRNG(); - - status = nss_OpenCertDB(configdir); - if (status != SECSuccess) - goto loser; - - status = nss_OpenKeyDB(configdir); - if (status != SECSuccess) - goto loser; - - status = nss_OpenSecModDB(configdir); - if (status != SECSuccess) - goto loser; - - rv = SECSuccess; - -loser: - if (rv != SECSuccess) - NSS_Shutdown(); - return rv; -} - -void -NSS_Shutdown(void) -{ - CERTCertDBHandle *certHandle; - SECKEYKeyDBHandle *keyHandle; - - certHandle = CERT_GetDefaultCertDB(); - if (certHandle) - CERT_ClosePermCertDB(certHandle); - - keyHandle = SECKEY_GetDefaultKeyDB(); - if (keyHandle) - SECKEY_CloseKeyDB(keyHandle); - - /* XXX - * This should also close the secmod DB, - * but there's no secmod function to close the DB. - */ -} |