security/manager/boot/src/PublicKeyPinningService.cpp.rej@deefc01c0e14 (annotated)
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.)
| 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) { |
