Merge pull request #1348 from mapbox/1307-digicert

Importing Digicert Cert

2 files changed, 22 insertions, 0 deletions

diff --git a/platform/ios/MGLMapboxEvents.m b/platform/ios/MGLMapboxEvents.m
index b714c927db..87a6ccc6a2 100644
--- a/platform/ios/MGLMapboxEvents.m
+++ b/platform/ios/MGLMapboxEvents.m
@@ -75,6 +75,7 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
 @property (atomic) NSDateFormatter *rfc3339DateFormatter;
 @property (atomic) CGFloat scale;
 @property (atomic) NSURLSession *session;
+@property (atomic) NSData *digicertCert;
 @property (atomic) NSData *geoTrustCert;
 
 
@@ -146,6 +147,12 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
             _geoTrustCert = [NSData dataWithContentsOfFile:cerPath];
         }
 
+        cerPath = nil;
+        cerPath = [[NSBundle bundleForClass:[MGLMapboxEvents class]] pathForResource:@"api_mapbox_com-digicert" ofType:@"der"];
+        if (cerPath != nil) {
+            _digicertCert = [NSData dataWithContentsOfFile:cerPath];
+        }
+
         // Events Control
         _eventQueue = [[NSMutableArray alloc] init];
         _flushAt = 20;
@@ -687,6 +694,7 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
             long numKeys = SecTrustGetCertificateCount(serverTrust);
 
             BOOL found = false;
+            // Try GeoTrust Cert First
             for (int lc = 0; lc < numKeys; lc++) {
                 SecCertificateRef certificate = SecTrustGetCertificateAtIndex(serverTrust, lc);
                 NSData *remoteCertificateData = CFBridgingRelease(SecCertificateCopyData(certificate));
@@ -700,6 +708,20 @@ NSString *const MGLEventGestureRotateStart = @"Rotation";
                 }
             }
 
+            // Fallback to Digicert Cert
+            for (int lc = 0; lc < numKeys; lc++) {
+                SecCertificateRef certificate = SecTrustGetCertificateAtIndex(serverTrust, lc);
+                NSData *remoteCertificateData = CFBridgingRelease(SecCertificateCopyData(certificate));
+
+                // Compare Remote Key With Local Version
+                if ([remoteCertificateData isEqualToData:_digicertCert]) {
+                    // Found the certificate; continue connecting
+                    completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
+                    found = true;
+                    break;
+                }
+            }
+
             if (!found) {
                 // The certificate wasn't found in the certificate chain; cancel the connection
                 completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
diff --git a/platform/ios/resources/api_mapbox_com-digicert.der b/platform/ios/resources/api_mapbox_com-digicert.der
new file mode 100644
index 0000000000..d84cee3908
--- /dev/null
+++ b/platform/ios/resources/api_mapbox_com-digicert.der