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

fixed a bug found in dev testing #215

Merged
ysd24 merged 2 commits into from
Aug 9, 2019
Merged

fixed a bug found in dev testing #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5601b5d
fixed a bug found in dev testing
Aug 8, 2019
34952fa
updated version number to 2.0.00
Aug 8, 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
8 changes: 7 additions & 1 deletion 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 @@ -102,7 +102,7 @@ - (BOOL)evaluateSecurityConfigurationsForServerTrust:(SecTrustRef)serverTrust fo
isPublicKeyHashVerified = YES;
}

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

Expand Down Expand Up @@ -160,6 +160,8 @@ - (BOOL)validateCertPinning:(SecTrustRef)serverTrust configuration:(MASSecurityC
{
return NO;
}

return YES;
}
}

Expand Down Expand Up @@ -190,6 +192,8 @@ - (BOOL)validateIntermediateCertPinning:(SecTrustRef)serverTrust configuration:(
}
}

return YES;

}

return NO;
Expand Down Expand Up @@ -286,6 +290,8 @@ - (BOOL)validatePublicKeyHash:(SecTrustRef)serverTrust configuration:(MASSecurit
{
return NO;
}

return YES;
}

return NO;
Expand Down
2 changes: 1 addition & 1 deletion MASFoundation/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.9.20</string>
<string>2.0.00</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down