Merge pull request #166 from thezonie/upstream/utcExpirationDate

Setting the Expiration Date time zone to UTC
datatheorem · Jul 9, 2018 · 49d48d5 · 49d48d5
2 parents 8588116 + ab1ee30
commit 49d48d5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/TrustKit/parse_configuration.m b/TrustKit/parse_configuration.m
@@ -132,9 +132,10 @@
         NSString *expirationDateStr = domainPinningPolicy[kTSKExpirationDate];
         if (expirationDateStr != nil)
         {
-            // Convert the string in the yyyy-MM-dd format into an actual date
+            // Convert the string in the yyyy-MM-dd format into an actual date in UTC
             NSDateFormatter *dateFormat = [[NSDateFormatter alloc] init];
-            [dateFormat setDateFormat:@"yyyy-MM-dd"];
+            dateFormat.dateFormat = @"yyyy-MM-dd";
+            dateFormat.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
             NSDate *expirationDate = [dateFormat dateFromString:expirationDateStr];
             domainFinalConfiguration[kTSKExpirationDate] = expirationDate;
         }

diff --git a/TrustKitTests/TSKPinConfigurationTests.m b/TrustKitTests/TSKPinConfigurationTests.m
@@ -152,7 +152,8 @@ - (void)testGetConfigurationPinningEnabledWithExpirationDate
 
     // Validate the content of the config
     NSDateFormatter *dateFormat = [[NSDateFormatter alloc] init];
-    [dateFormat setDateFormat:@"yyyy-MM-dd"];
+    dateFormat.dateFormat = @"yyyy-MM-dd";
+    dateFormat.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
     NSDate *expirationDate = [dateFormat dateFromString:expirationDateStr];
 
     NSDictionary *serverConfig = trustKitConfig[kTSKPinnedDomains][serverConfigKey];

diff --git a/TrustKitTests/TSKReporterTests.m b/TrustKitTests/TSKReporterTests.m
@@ -109,7 +109,8 @@ - (void)testSendReportFromValidationReport
 
 
     NSDateFormatter *dateFormat = [[NSDateFormatter alloc] init];
-    [dateFormat setDateFormat:@"yyyy-MM-dd"];
+    dateFormat.dateFormat = @"yyyy-MM-dd";
+    dateFormat.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
     NSDate *expirationDate = [dateFormat dateFromString:expirationDateStr];
 
     TSKPinningValidatorResult *res;