Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(328)

Unified Diff: nss/mozilla/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c

Issue 10540165: Update NSS to NSS 3.13.5 (from NSS 3.13.3). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: nss/mozilla/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c
===================================================================
--- nss/mozilla/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c (revision 142244)
+++ nss/mozilla/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c (working copy)
@@ -1669,13 +1669,13 @@
void *plContext)
{
CERTCertificate *nssCert = NULL;
- PKIX_UInt32 myVersion = 1;
+ PKIX_UInt32 myVersion = 0; /* v1 */
PKIX_ENTER(CERT, "PKIX_PL_Cert_GetVersion");
PKIX_NULLCHECK_THREE(cert, cert->nssCert, pVersion);
nssCert = cert->nssCert;
- if (nssCert->version.data) {
+ if (nssCert->version.len != 0) {
myVersion = *(nssCert->version.data);
}
@@ -2889,6 +2889,9 @@
status = CERT_VerifySignedDataWithPublicKey(tbsCert, nssPubKey, wincx);
if (status != SECSuccess) {
+ if (PORT_GetError() != SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED) {
+ PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
+ }
PKIX_ERROR(PKIX_SIGNATUREDIDNOTVERIFYWITHTHEPUBLICKEY);
}

Powered by Google App Engine
This is Rietveld 408576698