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