1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/security/manager/boot/src/PublicKeyPinningService.cpp.rej Wed Dec 31 06:09:35 2014 +0100 1.3 @@ -0,0 +1,11 @@ 1.4 +diff a/security/manager/boot/src/PublicKeyPinningService.cpp b/security/manager/boot/src/PublicKeyPinningService.cpp (rejected hunks) 1.5 +@@ -296,7 +296,8 @@ PublicKeyPinningService::ChainHasValidPins(const CERTCertList* certList, 1.6 + if (!certList) { 1.7 + return false; 1.8 + } 1.9 +- if (time > TimeFromElapsedSecondsAD(kPreloadPKPinsExpirationTime)) { 1.10 ++ if (time > TimeFromEpochInSeconds(kPreloadPKPinsExpirationTime / 1.11 ++ PR_USEC_PER_SEC)) { 1.12 + return true; 1.13 + } 1.14 + if (!hostname || hostname[0] == 0) {