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

Wed, 31 Dec 2014 06:55:50 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 31 Dec 2014 06:55:50 +0100
changeset 2
7e26c7da4463
permissions
-rw-r--r--

Added tag UPSTREAM_283F7C6 for changeset ca08bd8f51b2

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