Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Update security policy test certificates #4103

Merged
merged 9 commits into from
Nov 23, 2017
Merged

Update security policy test certificates #4103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2506685
Make tests pass again
SlaunchaMan Jul 13, 2017
e05a7a6
Fix macOS builds in Fastlane.
SlaunchaMan Jul 13, 2017
f04459c
Protect against NULL blocks.
SlaunchaMan Nov 22, 2017
c411d1a
Merge remote-tracking branch 'upstream/master' into update-security-p…
SlaunchaMan Nov 22, 2017
527eb83
Update HTTPBin certificate.
SlaunchaMan Nov 22, 2017
fc4ca57
Remove extraneous space.
SlaunchaMan Nov 22, 2017
2ab663b
Back out change to make coverage happy.
SlaunchaMan Nov 22, 2017
c551e0f
Merge branch 'update-security-policy-test-certificates' of github.com…
SlaunchaMan Nov 22, 2017
edc393d
Backing out change
SlaunchaMan Nov 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions AFNetworking.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
1BF9F9601C87832B00F1F35A /* AFImageResponseSerializerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BF9F95F1C87832B00F1F35A /* AFImageResponseSerializerTests.m */; };
1BF9F9611C87843200F1F35A /* AFImageResponseSerializerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BF9F95F1C87832B00F1F35A /* AFImageResponseSerializerTests.m */; };
1BF9F9621C87843300F1F35A /* AFImageResponseSerializerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BF9F95F1C87832B00F1F35A /* AFImageResponseSerializerTests.m */; };
1F0EEE581FC5E7EC00DAF282 /* httpbinorg_02102018.cer in Resources */ = {isa = PBXBuildFile; fileRef = 1F0EEE571FC5E74A00DAF282 /* httpbinorg_02102018.cer */; };
1F0EEE591FC5E7F100DAF282 /* httpbinorg_02102018.cer in Resources */ = {isa = PBXBuildFile; fileRef = 1F0EEE571FC5E74A00DAF282 /* httpbinorg_02102018.cer */; };
1F0EEE5A1FC5E7F200DAF282 /* httpbinorg_02102018.cer in Resources */ = {isa = PBXBuildFile; fileRef = 1F0EEE571FC5E74A00DAF282 /* httpbinorg_02102018.cer */; };
1F6F7DF71F17051000C979D0 /* DST Root CA X3.cer in Resources */ = {isa = PBXBuildFile; fileRef = 1F6F7DF61F1703A100C979D0 /* DST Root CA X3.cer */; };
1F6F7DF81F17051000C979D0 /* Let's Encrypt Authority X3.cer in Resources */ = {isa = PBXBuildFile; fileRef = 1F6F7DF51F1703A100C979D0 /* Let's Encrypt Authority X3.cer */; };
1F6F7DF91F17051000C979D0 /* httpbinorg_08132017.cer in Resources */ = {isa = PBXBuildFile; fileRef = 1F6F7DF41F1703A100C979D0 /* httpbinorg_08132017.cer */; };
1F6F7DFA1F17051000C979D0 /* DST Root CA X3.cer in Resources */ = {isa = PBXBuildFile; fileRef = 1F6F7DF61F1703A100C979D0 /* DST Root CA X3.cer */; };
1F6F7DFB1F17051000C979D0 /* Let's Encrypt Authority X3.cer in Resources */ = {isa = PBXBuildFile; fileRef = 1F6F7DF51F1703A100C979D0 /* Let's Encrypt Authority X3.cer */; };
1F6F7DFC1F17051000C979D0 /* httpbinorg_08132017.cer in Resources */ = {isa = PBXBuildFile; fileRef = 1F6F7DF41F1703A100C979D0 /* httpbinorg_08132017.cer */; };
1F6F7DFD1F17051100C979D0 /* DST Root CA X3.cer in Resources */ = {isa = PBXBuildFile; fileRef = 1F6F7DF61F1703A100C979D0 /* DST Root CA X3.cer */; };
1F6F7DFE1F17051100C979D0 /* Let's Encrypt Authority X3.cer in Resources */ = {isa = PBXBuildFile; fileRef = 1F6F7DF51F1703A100C979D0 /* Let's Encrypt Authority X3.cer */; };
1F6F7DFF1F17051100C979D0 /* httpbinorg_08132017.cer in Resources */ = {isa = PBXBuildFile; fileRef = 1F6F7DF41F1703A100C979D0 /* httpbinorg_08132017.cer */; };
2960BAC31C1B2F1A00BA02F0 /* AFUIButtonTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2960BAC21C1B2F1A00BA02F0 /* AFUIButtonTests.m */; };
297824A31BC2D69A0041C395 /* adn_0.cer in Resources */ = {isa = PBXBuildFile; fileRef = 297824A01BC2D69A0041C395 /* adn_0.cer */; };
297824A41BC2D69A0041C395 /* adn_0.cer in Resources */ = {isa = PBXBuildFile; fileRef = 297824A01BC2D69A0041C395 /* adn_0.cer */; };
Expand Down Expand Up @@ -225,7 +225,7 @@

/* Begin PBXFileReference section */
1BF9F95F1C87832B00F1F35A /* AFImageResponseSerializerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFImageResponseSerializerTests.m; sourceTree = "<group>"; };
1F6F7DF41F1703A100C979D0 /* httpbinorg_08132017.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = httpbinorg_08132017.cer; sourceTree = "<group>"; };
1F0EEE571FC5E74A00DAF282 /* httpbinorg_02102018.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = httpbinorg_02102018.cer; sourceTree = "<group>"; };
1F6F7DF51F1703A100C979D0 /* Let's Encrypt Authority X3.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Let's Encrypt Authority X3.cer"; sourceTree = "<group>"; };
1F6F7DF61F1703A100C979D0 /* DST Root CA X3.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DST Root CA X3.cer"; sourceTree = "<group>"; };
2960BAC21C1B2F1A00BA02F0 /* AFUIButtonTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFUIButtonTests.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -401,7 +401,7 @@
298D7CE21BC2CB7C00FD3B3E /* HTTPBinOrgServerTrustChain */,
1F6F7DF61F1703A100C979D0 /* DST Root CA X3.cer */,
1F6F7DF51F1703A100C979D0 /* Let's Encrypt Authority X3.cer */,
1F6F7DF41F1703A100C979D0 /* httpbinorg_08132017.cer */,
1F0EEE571FC5E74A00DAF282 /* httpbinorg_02102018.cer */,
);
path = HTTPBin.org;
sourceTree = "<group>";
Expand Down Expand Up @@ -831,11 +831,11 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1F0EEE5A1FC5E7F200DAF282 /* httpbinorg_02102018.cer in Resources */,
2987B0DE1BC40AFB00179A4C /* foobar.com.cer in Resources */,
2987B0D61BC40AEC00179A4C /* ADNNetServerTrustChain in Resources */,
2987B0DF1BC40AFB00179A4C /* NoDomains.cer in Resources */,
2987B0D41BC40AE900179A4C /* adn_1.cer in Resources */,
1F6F7DFF1F17051100C979D0 /* httpbinorg_08132017.cer in Resources */,
2987B0DD1BC40AFB00179A4C /* AltName.cer in Resources */,
2987B0D71BC40AF000179A4C /* HTTPBinOrgServerTrustChain in Resources */,
2987B0D31BC40AE900179A4C /* adn_0.cer in Resources */,
Expand All @@ -857,11 +857,11 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1F0EEE581FC5E7EC00DAF282 /* httpbinorg_02102018.cer in Resources */,
298D7CBF1BC2CA9D00FD3B3E /* foobar.com.cer in Resources */,
298D7CBA1BC2CA9800FD3B3E /* logo.png in Resources */,
297824A31BC2D69A0041C395 /* adn_0.cer in Resources */,
298D7CE31BC2CB7C00FD3B3E /* HTTPBinOrgServerTrustChain in Resources */,
1F6F7DF91F17051000C979D0 /* httpbinorg_08132017.cer in Resources */,
297824A71BC2D69A0041C395 /* adn_2.cer in Resources */,
297824A51BC2D69A0041C395 /* adn_1.cer in Resources */,
298D7CC01BC2CA9D00FD3B3E /* NoDomains.cer in Resources */,
Expand All @@ -883,11 +883,11 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1F0EEE591FC5E7F100DAF282 /* httpbinorg_02102018.cer in Resources */,
298D7CBC1BC2CA9C00FD3B3E /* foobar.com.cer in Resources */,
298D7CB91BC2CA9800FD3B3E /* logo.png in Resources */,
297824A41BC2D69A0041C395 /* adn_0.cer in Resources */,
298D7CE41BC2CB7C00FD3B3E /* HTTPBinOrgServerTrustChain in Resources */,
1F6F7DFC1F17051000C979D0 /* httpbinorg_08132017.cer in Resources */,
297824A81BC2D69A0041C395 /* adn_2.cer in Resources */,
297824A61BC2D69A0041C395 /* adn_1.cer in Resources */,
298D7CBD1BC2CA9C00FD3B3E /* NoDomains.cer in Resources */,
Expand Down
Binary file modified Tests/Resources/HTTPBin.org/HTTPBinOrgServerTrustChain/httpbin_0.cer
View file
Open in desktop
Binary file not shown.
Binary file added Tests/Resources/HTTPBin.org/httpbinorg_02102018.cer
View file
Open in desktop
Binary file not shown.
Binary file removed Tests/Resources/HTTPBin.org/httpbinorg_08132017.cer
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Tests/Tests/AFSecurityPolicyTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static SecTrustRef AFUTADNNetServerTrust() {
}

static SecCertificateRef AFUTHTTPBinOrgCertificate() {
NSString *certPath = [[NSBundle bundleForClass:[AFSecurityPolicyTests class]] pathForResource:@"httpbinorg_08132017" ofType:@"cer"];
NSString *certPath = [[NSBundle bundleForClass:[AFSecurityPolicyTests class]] pathForResource:@"httpbinorg_02102018" ofType:@"cer"];
NSCAssert(certPath != nil, @"Path for certificate should not be nil");
NSData *certData = [NSData dataWithContentsOfFile:certPath];

Expand Down