security/manager/boot/src/PublicKeyPinningService.cpp.rej

Thu, 22 Jan 2015 13:21:57 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 22 Jan 2015 13:21:57 +0100
branch
TOR_BUG_9701
changeset 15
b8a032363ba2
permissions
-rw-r--r--

Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6

michael@0 1 diff a/security/manager/boot/src/PublicKeyPinningService.cpp b/security/manager/boot/src/PublicKeyPinningService.cpp (rejected hunks)
michael@0 2 @@ -296,7 +296,8 @@ PublicKeyPinningService::ChainHasValidPins(const CERTCertList* certList,
michael@0 3 if (!certList) {
michael@0 4 return false;
michael@0 5 }
michael@0 6 - if (time > TimeFromElapsedSecondsAD(kPreloadPKPinsExpirationTime)) {
michael@0 7 + if (time > TimeFromEpochInSeconds(kPreloadPKPinsExpirationTime /
michael@0 8 + PR_USEC_PER_SEC)) {
michael@0 9 return true;
michael@0 10 }
michael@0 11 if (!hostname || hostname[0] == 0) {

mercurial