security/manager/boot/src/PublicKeyPinningService.cpp.rej@deefc01c0e14
security/manager/boot/src/PublicKeyPinningService.cpp.rej
Thu, 15 Jan 2015 21:03:48 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 15 Jan 2015 21:03:48 +0100
- branch
- TOR_BUG_9701
- changeset 11
- deefc01c0e14
- permissions
- -rw-r--r--
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
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) {
