From e7138e9e5ea72c83d05c733a99966516e38f8184 Mon Sep 17 00:00:00 2001 From: tburgin Date: Tue, 27 Feb 2018 14:24:34 -0500 Subject: [PATCH] default MOL structure --- MOLCertificate.podspec | 4 +- MOLCertificate.xcodeproj/project.pbxproj | 40 ++++++++++++-------- Source/{ => MOLCertificate}/MOLCertificate.h | 0 Source/{ => MOLCertificate}/MOLCertificate.m | 0 Tests/MOLCertificateTest.m | 15 +++++--- 5 files changed, 35 insertions(+), 24 deletions(-) rename Source/{ => MOLCertificate}/MOLCertificate.h (100%) rename Source/{ => MOLCertificate}/MOLCertificate.m (100%) diff --git a/MOLCertificate.podspec b/MOLCertificate.podspec index c936cfa..a350177 100644 --- a/MOLCertificate.podspec +++ b/MOLCertificate.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'MOLCertificate' - s.version = '1.7' + s.version = '1.8' s.platform = :osx, '10.8' s.license = { :type => 'Apache', :file => 'LICENSE' } s.homepage = 'https://github.com/google/macops-molcertificate' @@ -8,6 +8,6 @@ Pod::Spec.new do |s| s.summary = 'Objective-C wrapper around SecCertificateRef' s.source = { :git => 'https://github.com/google/macops-molcertificate.git', :tag => "v#{s.version}" } - s.source_files = 'Source/MOLCertificate.{h,m}' + s.source_files = 'Source/MOLCertificate/MOLCertificate.{h,m}' s.framework = 'Security' end diff --git a/MOLCertificate.xcodeproj/project.pbxproj b/MOLCertificate.xcodeproj/project.pbxproj index 61bb744..b72f8da 100644 --- a/MOLCertificate.xcodeproj/project.pbxproj +++ b/MOLCertificate.xcodeproj/project.pbxproj @@ -8,13 +8,13 @@ /* Begin PBXBuildFile section */ 0D53CACD1B71548E00073187 /* libMOLCertificate.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D53CAC11B71548E00073187 /* libMOLCertificate.dylib */; }; - 0D53CADD1B71549A00073187 /* MOLCertificate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D53CADB1B71549A00073187 /* MOLCertificate.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0D53CADE1B71549A00073187 /* MOLCertificate.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D53CADC1B71549A00073187 /* MOLCertificate.m */; }; 0D53CAE01B7154A000073187 /* MOLCertificateTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 0D53CADF1B7154A000073187 /* MOLCertificateTest.m */; }; 0D53CAE51B7154B700073187 /* apple.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0D53CAE11B7154B700073187 /* apple.pem */; }; 0D53CAE61B7154B700073187 /* GIAG2.crt in Resources */ = {isa = PBXBuildFile; fileRef = 0D53CAE21B7154B700073187 /* GIAG2.crt */; }; 0D53CAE71B7154B700073187 /* GIAG2.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0D53CAE31B7154B700073187 /* GIAG2.pem */; }; 0D53CAE81B7154B700073187 /* tubitak.crt in Resources */ = {isa = PBXBuildFile; fileRef = 0D53CAE41B7154B700073187 /* tubitak.crt */; }; + C7C1D4CF2045E2FA00E896E5 /* MOLCertificate.m in Sources */ = {isa = PBXBuildFile; fileRef = C7C1D4CE2045E2F200E896E5 /* MOLCertificate.m */; }; + C7C1D4D02045E32000E896E5 /* MOLCertificate.h in Headers */ = {isa = PBXBuildFile; fileRef = C7C1D4CD2045E2F200E896E5 /* MOLCertificate.h */; settings = {ATTRIBUTES = (Public, ); }; }; D26C9B441BCC3BA00046845A /* NTPrincipalName.pem in Resources */ = {isa = PBXBuildFile; fileRef = D26C9B431BCC3BA00046845A /* NTPrincipalName.pem */; }; /* End PBXBuildFile section */ @@ -32,13 +32,13 @@ 0D53CAC11B71548E00073187 /* libMOLCertificate.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libMOLCertificate.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 0D53CACC1B71548E00073187 /* MOLCertificateTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MOLCertificateTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 0D53CAD21B71548E00073187 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 0D53CADB1B71549A00073187 /* MOLCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MOLCertificate.h; sourceTree = ""; }; - 0D53CADC1B71549A00073187 /* MOLCertificate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MOLCertificate.m; sourceTree = ""; }; 0D53CADF1B7154A000073187 /* MOLCertificateTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MOLCertificateTest.m; sourceTree = ""; }; 0D53CAE11B7154B700073187 /* apple.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = apple.pem; sourceTree = ""; }; 0D53CAE21B7154B700073187 /* GIAG2.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = GIAG2.crt; sourceTree = ""; }; 0D53CAE31B7154B700073187 /* GIAG2.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GIAG2.pem; sourceTree = ""; }; 0D53CAE41B7154B700073187 /* tubitak.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = tubitak.crt; sourceTree = ""; }; + C7C1D4CD2045E2F200E896E5 /* MOLCertificate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MOLCertificate.h; sourceTree = ""; }; + C7C1D4CE2045E2F200E896E5 /* MOLCertificate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MOLCertificate.m; sourceTree = ""; }; D26C9B431BCC3BA00046845A /* NTPrincipalName.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NTPrincipalName.pem; sourceTree = ""; }; /* End PBXFileReference section */ @@ -64,7 +64,7 @@ 0D53CAB81B71548E00073187 = { isa = PBXGroup; children = ( - 0D53CAC31B71548E00073187 /* Source */, + C7C1D4CB2045E2F200E896E5 /* Source */, 0D53CAD01B71548E00073187 /* Tests */, 0D53CAC21B71548E00073187 /* Products */, ); @@ -79,15 +79,6 @@ name = Products; sourceTree = ""; }; - 0D53CAC31B71548E00073187 /* Source */ = { - isa = PBXGroup; - children = ( - 0D53CADB1B71549A00073187 /* MOLCertificate.h */, - 0D53CADC1B71549A00073187 /* MOLCertificate.m */, - ); - path = Source; - sourceTree = ""; - }; 0D53CAD01B71548E00073187 /* Tests */ = { isa = PBXGroup; children = ( @@ -110,6 +101,23 @@ name = "Supporting Files"; sourceTree = ""; }; + C7C1D4CB2045E2F200E896E5 /* Source */ = { + isa = PBXGroup; + children = ( + C7C1D4CC2045E2F200E896E5 /* MOLCertificate */, + ); + path = Source; + sourceTree = ""; + }; + C7C1D4CC2045E2F200E896E5 /* MOLCertificate */ = { + isa = PBXGroup; + children = ( + C7C1D4CD2045E2F200E896E5 /* MOLCertificate.h */, + C7C1D4CE2045E2F200E896E5 /* MOLCertificate.m */, + ); + path = MOLCertificate; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -117,7 +125,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 0D53CADD1B71549A00073187 /* MOLCertificate.h in Headers */, + C7C1D4D02045E32000E896E5 /* MOLCertificate.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -214,7 +222,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0D53CADE1B71549A00073187 /* MOLCertificate.m in Sources */, + C7C1D4CF2045E2FA00E896E5 /* MOLCertificate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Source/MOLCertificate.h b/Source/MOLCertificate/MOLCertificate.h similarity index 100% rename from Source/MOLCertificate.h rename to Source/MOLCertificate/MOLCertificate.h diff --git a/Source/MOLCertificate.m b/Source/MOLCertificate/MOLCertificate.m similarity index 100% rename from Source/MOLCertificate.m rename to Source/MOLCertificate/MOLCertificate.m diff --git a/Tests/MOLCertificateTest.m b/Tests/MOLCertificateTest.m index 761dae4..a02e7c0 100644 --- a/Tests/MOLCertificateTest.m +++ b/Tests/MOLCertificateTest.m @@ -14,7 +14,7 @@ #import -#import "MOLCertificate.h" +#import @interface MOLCertificateTest : XCTestCase @property NSString *testDataPEM1; @@ -114,8 +114,10 @@ - (void)testInitWithValidPEM { XCTAssertEqualObjects(sut.SHA1, @"d83c1a7f4d0446bb2081b81a1670f8183451ca24"); XCTAssertEqualObjects(sut.SHA256, @"a047a37fa2d2e118a4f5095fe074d6cfe0e352425a7632bf8659c03919a6c81d"); - XCTAssertEqualObjects(sut.validFrom, [NSDate dateWithString:@"2013-04-05 15:15:55 +0000"]); - XCTAssertEqualObjects(sut.validUntil, [NSDate dateWithString:@"2015-04-04 15:15:55 +0000"]); + NSDateFormatter *dateFormat = [[NSDateFormatter alloc] init]; + dateFormat.dateFormat = @"yyyy-MM-dd HH:mm:ss Z"; + XCTAssertEqualObjects(sut.validFrom, [dateFormat dateFromString:@"2013-04-05 15:15:55 +0000"]); + XCTAssertEqualObjects(sut.validUntil, [dateFormat dateFromString:@"2015-04-04 15:15:55 +0000"]); XCTAssertTrue(sut.isCA); XCTAssertEqualObjects(sut.serialNumber, @"146025"); XCTAssertEqualObjects(sut.dnsName, nil); @@ -128,12 +130,13 @@ - (void)testInitWithValidPEM { XCTAssertEqualObjects(sut.issuerCommonName, @"VeriSign Class 3 Extended Validation SSL SGC CA"); XCTAssertEqualObjects(sut.issuerOrgName, @"VeriSign, Inc."); XCTAssertEqualObjects(sut.issuerOrgUnit, @"VeriSign Trust Network"); - XCTAssertEqualObjects(sut.issuerOrgUnits[1], @"Terms of use at https://www.verisign.com/rpa (c)06"); + XCTAssertEqualObjects(sut.issuerOrgUnits[1], + @"Terms of use at https://www.verisign.com/rpa (c)06"); XCTAssertEqualObjects(sut.SHA1, @"96df534f6f4306ca474d9078fc346b20f856f0d4"); XCTAssertEqualObjects(sut.SHA256, @"129d39ff4384197dc2bcbe1a83a69b3405b7df33254b1b1ee29a23847a23555a"); - XCTAssertEqualObjects(sut.validFrom, [NSDate dateWithString:@"2013-11-14 00:00:00 +0000"]); - XCTAssertEqualObjects(sut.validUntil, [NSDate dateWithString:@"2015-11-14 23:59:59 +0000"]); + XCTAssertEqualObjects(sut.validFrom, [dateFormat dateFromString:@"2013-11-14 00:00:00 +0000"]); + XCTAssertEqualObjects(sut.validUntil, [dateFormat dateFromString:@"2015-11-14 23:59:59 +0000"]); XCTAssertFalse(sut.isCA); XCTAssertEqualObjects(sut.serialNumber, @"5E FA 67 0E 99 E4 AB 88 E0 F2 0B 33 86 7B 78 4D"); XCTAssertEqualObjects(sut.dnsName, @"www.apple.com");