From cde989093baaf8fac2c4287fd462cf419abf1052 Mon Sep 17 00:00:00 2001
From: Brad Leege <bleege@gmail.com>
Date: Mon, 27 Apr 2015 12:22:05 -0400
Subject: [PATCH] #1307 - Adding digicert to sdks and ssl handshaking check

---
 platform/ios/MGLMapboxEvents.m                |  22 ++++++++++++++++++
 .../ios/resources/api_mapbox_com-digicert.der | Bin 0 -> 2077 bytes
 2 files changed, 22 insertions(+)
 create mode 100644 platform/ios/resources/api_mapbox_com-digicert.der

diff --git a/platform/ios/MGLMapboxEvents.m b/platform/ios/MGLMapboxEvents.m
index b32e13988..42c1dc07c 100644
--- a/platform/ios/MGLMapboxEvents.m
+++ b/platform/ios/MGLMapboxEvents.m
@@ -74,6 +74,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;
 
 
@@ -145,6 +146,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;
@@ -679,6 +686,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));
@@ -692,6 +700,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 0000000000000000000000000000000000000000..d84cee390869435b9b0672232b5597f347b67faf
GIT binary patch
literal 2077
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

literal 0
HcmV?d00001