Skip to content
This repository was archived by the owner on Jan 21, 2022. It is now read-only.

Us579432 intermediate cert pinning #214

Merged
mahithegeek merged 2 commits into from
Jul 26, 2019
Merged

Us579432 intermediate cert pinning #214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a2a8f7
added backward compatibility support for public key hash pinning
Jul 25, 2019
a62ab4d
some more changes related to backwards compatibility
Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions MASFoundation/Classes/_private_/services/network/internal/MASSecurityPolicy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,21 @@ - (BOOL)evaluateSecurityConfigurationsForServerTrust:(SecTrustRef)serverTrust fo
switch (securityConfiguration.pinningMode) {
case MASSecuritySSLPinningModeCertificate:
{
isPinningVerified = [self validateCertPinning:serverTrust configuration:securityConfiguration certChain:certificateChain];
BOOL isPublicKeyHashVerified = NO;

if (securityConfiguration.publicKeyHashes != nil && [securityConfiguration.publicKeyHashes isKindOfClass:[NSArray class]] && [securityConfiguration.publicKeyHashes count] > 0)
{
isPublicKeyHashVerified = [self validatePublicKeyHash:serverTrust configuration:securityConfiguration];
}
else
{
isPublicKeyHashVerified = YES;
}

isPinningVerified = ([self validateCertPinning:serverTrust configuration:securityConfiguration certChain:certificateChain]) || isPublicKeyHashVerified;
}
break;

case MASSecuritySSLPinningModeIntermediateCertifcate:
{
isPinningVerified = [self validateIntermediateCertPinning:serverTrust configuration:securityConfiguration certChain:certificateChain];
Expand Down Expand Up @@ -151,7 +163,7 @@ - (BOOL)validateCertPinning:(SecTrustRef)serverTrust configuration:(MASSecurityC
}
}

return YES;
return NO;
}


Expand Down Expand Up @@ -180,7 +192,7 @@ - (BOOL)validateIntermediateCertPinning:(SecTrustRef)serverTrust configuration:(

}

return YES;
return NO;
}


Expand Down Expand Up @@ -276,7 +288,7 @@ - (BOOL)validatePublicKeyHash:(SecTrustRef)serverTrust configuration:(MASSecurit
}
}

return YES;
return NO;
}


Expand Down