diff options
| author | ian.mcgreer%sun.com <devnull@localhost> | 2001-12-20 16:50:22 +0000 |
|---|---|---|
| committer | ian.mcgreer%sun.com <devnull@localhost> | 2001-12-20 16:50:22 +0000 |
| commit | 8094c2dcac0012182d80f486679f21cd089db8f7 (patch) | |
| tree | 65ef04aa75ff3fb10bb48fc553f222a8f6e9626d /security | |
| parent | d99e3f0a44b79aa57bd78413d91eba65e14100f7 (diff) | |
| download | nss-hg-8094c2dcac0012182d80f486679f21cd089db8f7.tar.gz | |
remove unneeded hack, put in a couple of error checks
Diffstat (limited to 'security')
| -rw-r--r-- | security/nss/lib/certdb/stanpcertdb.c | 5 | ||||
| -rw-r--r-- | security/nss/lib/certhigh/certvfy.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/security/nss/lib/certdb/stanpcertdb.c b/security/nss/lib/certdb/stanpcertdb.c index 96f7e6aad..ae6e6fe5f 100644 --- a/security/nss/lib/certdb/stanpcertdb.c +++ b/security/nss/lib/certdb/stanpcertdb.c @@ -205,11 +205,6 @@ __CERT_NewTempCertificate(CERTCertDBHandle *handle, SECItem *derCert, } context = STAN_GetDefaultCryptoContext(); NSSCryptoContext_ImportCertificate(context, c); - /* This is a hack to work around the fact that an instance of the cert - * doesn't really exist until the import - */ - cc->nssCertificate = NULL; - cc = STAN_GetCERTCertificate(c); return cc; loser: nssArena_Destroy(arena); diff --git a/security/nss/lib/certhigh/certvfy.c b/security/nss/lib/certhigh/certvfy.c index 85407ff44..810229db5 100644 --- a/security/nss/lib/certhigh/certvfy.c +++ b/security/nss/lib/certhigh/certvfy.c @@ -412,6 +412,10 @@ loser: nssUsage.nss3usage = usage; nssUsage.nss3lookingForCA = PR_TRUE; memset(chain, 0, 3*sizeof(NSSCertificate *)); + if (!me) { + PORT_SetError (SEC_ERROR_BAD_DATABASE); + return NULL; + } (void)NSSCertificate_BuildChain(me, nssTime, &nssUsage, NULL, chain, 2, NULL, &status); nss_ZFreeIf(nssTime); @@ -433,6 +437,8 @@ loser: return CERT_DupCertificate(rvc); } } + } else { + PORT_SetError (SEC_ERROR_UNKNOWN_ISSUER); } return NULL; #endif |