From 16e44acf2b0147ee18b149b4351991ab9d13d7f2 Mon Sep 17 00:00:00 2001 From: Sergey Yanovich Date: Thu, 10 Jul 2008 18:58:39 +0300 Subject: [PATCH] nss: import at 3.0.1 beta 1 --- security/nss/lib/certhigh/ocsp.c | 5 +++-- security/nss/lib/libpkix/pkix/checker/pkix_ocspchecker.c | 6 +++++- security/nss/lib/nss/nss.h | 4 ++-- security/nss/lib/softoken/softkver.h | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/security/nss/lib/certhigh/ocsp.c b/security/nss/lib/certhigh/ocsp.c index cf04f39..41dbabd 100644 --- a/security/nss/lib/certhigh/ocsp.c +++ b/security/nss/lib/certhigh/ocsp.c @@ -39,7 +39,7 @@ * Implementation of OCSP services, for both client and server. * (XXX, really, mostly just for client right now, but intended to do both.) * - * $Id: ocsp.c,v 1.50 2008/02/13 15:29:12 kaie%kuix.de Exp $ + * $Id: ocsp.c,v 1.50.6.1 2008/05/28 18:03:11 kaie%kuix.de Exp $ */ #include "prerror.h" @@ -1516,10 +1516,11 @@ loser: SECStatus CERT_DestroyOCSPCertID(CERTOCSPCertID* certID) { - if (certID->poolp) { + if (certID && certID->poolp) { PORT_FreeArena(certID->poolp, PR_FALSE); return SECSuccess; } + PORT_SetError(SEC_ERROR_INVALID_ARGS); return SECFailure; } diff --git a/security/nss/lib/libpkix/pkix/checker/pkix_ocspchecker.c b/security/nss/lib/libpkix/pkix/checker/pkix_ocspchecker.c index 13ebcf7..0f58eb8 100644 --- a/security/nss/lib/libpkix/pkix/checker/pkix_ocspchecker.c +++ b/security/nss/lib/libpkix/pkix/checker/pkix_ocspchecker.c @@ -288,7 +288,11 @@ pkix_OcspChecker_Check( PKIX_OCSPRESPONSEGETSTATUSFORCERTFAILED); cleanup: - if (!passed && cid) { + if (!passed && cid && cid->certID && !cid->certIDWasConsumed) { + /* We still own the certID object, which means that + * it did not get consumed to create a cache entry. + * Let's make sure we create one. + */ PKIX_Error *err; err = PKIX_PL_OcspCertID_RememberOCSPProcessingFailure( cid, plContext); diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index 66a35cd..4e745ee 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -36,7 +36,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: nss.h,v 1.56.2.1 2008/04/17 20:18:48 christophe.ravel.bugs%sun.com Exp $ */ +/* $Id: nss.h,v 1.56.2.2 2008/05/28 18:08:20 kaie%kuix.de Exp $ */ #ifndef __nss_h_ #define __nss_h_ @@ -70,7 +70,7 @@ SEC_BEGIN_PROTOS * The format of the version string should be * ".[.][ ][ ]" */ -#define NSS_VERSION "3.12.0.2" _NSS_ECC_STRING _NSS_CUSTOMIZED +#define NSS_VERSION "3.12.0.3" _NSS_ECC_STRING _NSS_CUSTOMIZED #define NSS_VMAJOR 3 #define NSS_VMINOR 12 #define NSS_VPATCH 0 diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h index 5f3ad5b..72dfaa6 100644 --- a/security/nss/lib/softoken/softkver.h +++ b/security/nss/lib/softoken/softkver.h @@ -57,7 +57,7 @@ * The format of the version string should be * ".[.][ ][ ]" */ -#define SOFTOKEN_VERSION "3.12.0.2" SOFTOKEN_ECC_STRING +#define SOFTOKEN_VERSION "3.12.0.3" SOFTOKEN_ECC_STRING #define SOFTOKEN_VMAJOR 3 #define SOFTOKEN_VMINOR 12 #define SOFTOKEN_VPATCH 0 -- 2.11.4.GIT