Date: Sun, 15 Sep 2013 13:29:05 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1351 - in trunk: mail/thunderbird/files www/firefox/files www/seamonkey/files Message-ID: <201309151329.r8FDT5jO092494@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Sep 15 13:29:05 2013 New Revision: 1351 Log: remove forgotten hack, bug 842856 landed in nss-3.15 Deleted: trunk/mail/thunderbird/files/patch-bug834091 trunk/www/firefox/files/patch-bug834091 trunk/www/seamonkey/files/patch-bug834091 Deleted: trunk/mail/thunderbird/files/patch-bug834091 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug834091 Sun Sep 15 13:29:05 2013 (r1350) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,35 +0,0 @@ -commit 8d8975b -Author: Carmen Jiménez Cabezas <macajc@gmail.com> -Date: Fri Jan 25 15:36:36 2013 -0800 - - Bug 834091: Verify certificate chain for signed B2G apps as of the current time (now) instead of the signing time, r=bsmith - - --HG-- - extra : amend_source : 86d8ca2b28259aaf41983740b809ef8a51befc4f - extra : rebase_source : e5a1c1199756e929f14852f5c83ba28d097449f4 ---- - .../manager/ssl/src/JARSignatureVerification.cpp | 6 +- - security/nss/lib/pkcs7/p7decode.c | 41 +++- - security/nss/lib/pkcs7/secpkcs7.h | 17 ++ - security/nss/lib/smime/smime.def | 6 + - security/patches/README | 4 + - security/patches/bug-834091.patch | 216 +++++++++++++++++++++ - 6 files changed, 281 insertions(+), 9 deletions(-) - -diff --git security/manager/ssl/src/JARSignatureVerification.cpp security/manager/ssl/src/JARSignatureVerification.cpp -index d0a8b98..8e694d3 100644 ---- mozilla/security/manager/ssl/src/JARSignatureVerification.cpp -+++ mozilla/security/manager/ssl/src/JARSignatureVerification.cpp -@@ -586,9 +586,9 @@ - } - - // Verify that the signature file is a valid signature of the SF file -- if (!SEC_PKCS7VerifyDetachedSignatureAtTime(p7_info, certUsageObjectSigner, -- &sfCalculatedDigest.get(), -- HASH_AlgSHA1, false, PR_Now())) { -+ if (!SEC_PKCS7VerifyDetachedSignature(p7_info, certUsageObjectSigner, -+ &sfCalculatedDigest.get(), HASH_AlgSHA1, -+ false)) { - PRErrorCode error = PR_GetError(); - const char * errorName = PR_ErrorToName(error); - PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Failed to verify detached signature: %s", Deleted: trunk/www/firefox/files/patch-bug834091 ============================================================================== --- trunk/www/firefox/files/patch-bug834091 Sun Sep 15 13:29:05 2013 (r1350) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,35 +0,0 @@ -commit 8d8975b -Author: Carmen Jiménez Cabezas <macajc@gmail.com> -Date: Fri Jan 25 15:36:36 2013 -0800 - - Bug 834091: Verify certificate chain for signed B2G apps as of the current time (now) instead of the signing time, r=bsmith - - --HG-- - extra : amend_source : 86d8ca2b28259aaf41983740b809ef8a51befc4f - extra : rebase_source : e5a1c1199756e929f14852f5c83ba28d097449f4 ---- - .../manager/ssl/src/JARSignatureVerification.cpp | 6 +- - security/nss/lib/pkcs7/p7decode.c | 41 +++- - security/nss/lib/pkcs7/secpkcs7.h | 17 ++ - security/nss/lib/smime/smime.def | 6 + - security/patches/README | 4 + - security/patches/bug-834091.patch | 216 +++++++++++++++++++++ - 6 files changed, 281 insertions(+), 9 deletions(-) - -diff --git security/manager/ssl/src/JARSignatureVerification.cpp security/manager/ssl/src/JARSignatureVerification.cpp -index d0a8b98..8e694d3 100644 ---- security/manager/ssl/src/JARSignatureVerification.cpp -+++ security/manager/ssl/src/JARSignatureVerification.cpp -@@ -586,9 +586,9 @@ - } - - // Verify that the signature file is a valid signature of the SF file -- if (!SEC_PKCS7VerifyDetachedSignatureAtTime(p7_info, certUsageObjectSigner, -- &sfCalculatedDigest.get(), -- HASH_AlgSHA1, false, PR_Now())) { -+ if (!SEC_PKCS7VerifyDetachedSignature(p7_info, certUsageObjectSigner, -+ &sfCalculatedDigest.get(), HASH_AlgSHA1, -+ false)) { - PRErrorCode error = PR_GetError(); - const char * errorName = PR_ErrorToName(error); - PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Failed to verify detached signature: %s", Deleted: trunk/www/seamonkey/files/patch-bug834091 ============================================================================== --- trunk/www/seamonkey/files/patch-bug834091 Sun Sep 15 13:29:05 2013 (r1350) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,35 +0,0 @@ -commit 8d8975b -Author: Carmen Jiménez Cabezas <macajc@gmail.com> -Date: Fri Jan 25 15:36:36 2013 -0800 - - Bug 834091: Verify certificate chain for signed B2G apps as of the current time (now) instead of the signing time, r=bsmith - - --HG-- - extra : amend_source : 86d8ca2b28259aaf41983740b809ef8a51befc4f - extra : rebase_source : e5a1c1199756e929f14852f5c83ba28d097449f4 ---- - .../manager/ssl/src/JARSignatureVerification.cpp | 6 +- - security/nss/lib/pkcs7/p7decode.c | 41 +++- - security/nss/lib/pkcs7/secpkcs7.h | 17 ++ - security/nss/lib/smime/smime.def | 6 + - security/patches/README | 4 + - security/patches/bug-834091.patch | 216 +++++++++++++++++++++ - 6 files changed, 281 insertions(+), 9 deletions(-) - -diff --git security/manager/ssl/src/JARSignatureVerification.cpp security/manager/ssl/src/JARSignatureVerification.cpp -index d0a8b98..8e694d3 100644 ---- mozilla/security/manager/ssl/src/JARSignatureVerification.cpp -+++ mozilla/security/manager/ssl/src/JARSignatureVerification.cpp -@@ -586,9 +586,9 @@ - } - - // Verify that the signature file is a valid signature of the SF file -- if (!SEC_PKCS7VerifyDetachedSignatureAtTime(p7_info, certUsageObjectSigner, -- &sfCalculatedDigest.get(), -- HASH_AlgSHA1, false, PR_Now())) { -+ if (!SEC_PKCS7VerifyDetachedSignature(p7_info, certUsageObjectSigner, -+ &sfCalculatedDigest.get(), HASH_AlgSHA1, -+ false)) { - PRErrorCode error = PR_GetError(); - const char * errorName = PR_ErrorToName(error); - PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Failed to verify detached signature: %s",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309151329.r8FDT5jO092494>