Skip to content

Commit fa7a3e6

Browse files
gnachmangnachman
committed
Remove deprecated API from SIGKeychain
1 parent 500915d commit fa7a3e6

File tree

6 files changed

+0
-103
lines changed

6 files changed

+0
-103
lines changed

‎SignedArchive/SignedArchive.xcodeproj/project.pbxproj

-6
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
A6BC8B3121C8D81F00796BF3 /* SIGIdentity.m in Sources */ = {isa = PBXBuildFile; fileRef = A6BC8AEF21C78C1700796BF3 /* SIGIdentity.m */; };
2626
A6BC8B3221C8D81F00796BF3 /* SIGPartialInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = A6BC8B0F21C8CE7600796BF3 /* SIGPartialInputStream.m */; };
2727
A6BC8B3321C8D81F00796BF3 /* SIGKey.m in Sources */ = {isa = PBXBuildFile; fileRef = A6BC8AF721C791A700796BF3 /* SIGKey.m */; };
28-
A6BC8B3421C8D81F00796BF3 /* SIGKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = A6BC8AF321C78C5E00796BF3 /* SIGKeychain.m */; };
2928
A6BC8B3521C8D81F00796BF3 /* SIGTrust.m in Sources */ = {isa = PBXBuildFile; fileRef = A6BC8B0B21C8C67300796BF3 /* SIGTrust.m */; };
3029
A6BC8B3E21C8E30600796BF3 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A6BC8B3D21C8E30600796BF3 /* main.m */; };
3130
A6BC8B4221C8E3AB00796BF3 /* libSignedArchive.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A6BC8B2321C8D80D00796BF3 /* libSignedArchive.a */; };
@@ -126,8 +125,6 @@
126125
A6BC8AEB21C78A3000796BF3 /* SIGArchiveBuilder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SIGArchiveBuilder.m; sourceTree = "<group>"; };
127126
A6BC8AEE21C78C1700796BF3 /* SIGIdentity.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SIGIdentity.h; sourceTree = "<group>"; };
128127
A6BC8AEF21C78C1700796BF3 /* SIGIdentity.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SIGIdentity.m; sourceTree = "<group>"; };
129-
A6BC8AF221C78C5E00796BF3 /* SIGKeychain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SIGKeychain.h; sourceTree = "<group>"; };
130-
A6BC8AF321C78C5E00796BF3 /* SIGKeychain.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SIGKeychain.m; sourceTree = "<group>"; };
131128
A6BC8AF621C791A700796BF3 /* SIGKey.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SIGKey.h; sourceTree = "<group>"; };
132129
A6BC8AF721C791A700796BF3 /* SIGKey.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SIGKey.m; sourceTree = "<group>"; };
133130
A6BC8AFA21C7982800796BF3 /* SIGArchiveVerifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SIGArchiveVerifier.h; sourceTree = "<group>"; };
@@ -259,8 +256,6 @@
259256
A6BC8AEF21C78C1700796BF3 /* SIGIdentity.m */,
260257
A6BC8AF621C791A700796BF3 /* SIGKey.h */,
261258
A6BC8AF721C791A700796BF3 /* SIGKey.m */,
262-
A6BC8AF221C78C5E00796BF3 /* SIGKeychain.h */,
263-
A6BC8AF321C78C5E00796BF3 /* SIGKeychain.m */,
264259
A6BC8B0E21C8CE7600796BF3 /* SIGPartialInputStream.h */,
265260
A6BC8B0F21C8CE7600796BF3 /* SIGPartialInputStream.m */,
266261
53F5893C21C9AF38004A372B /* SIGPolicy.h */,
@@ -498,7 +493,6 @@
498493
A665C1CD243A4DF000F623F0 /* SIGArchiveCommon.m in Sources */,
499494
A6BC8B5321C965C100796BF3 /* SIGSHA2SigningAlgorithm.m in Sources */,
500495
A6BC8B5B21C96E4200796BF3 /* SIGSHA2VerificationAlgorithm.m in Sources */,
501-
A6BC8B3421C8D81F00796BF3 /* SIGKeychain.m in Sources */,
502496
A6BC8B3521C8D81F00796BF3 /* SIGTrust.m in Sources */,
503497
);
504498
runOnlyForDeploymentPostprocessing = 0;

‎SignedArchive/SignedArchive/SIGCertificate.m

-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#import "SIGCertificate.h"
1010

1111
#import "SIGKey.h"
12-
#import "SIGKeychain.h"
1312
#import "SIGTrust.h"
1413

1514
@implementation SIGCertificate {
@@ -189,10 +188,6 @@ - (SIGCertificate *)issuer {
189188
if (!_secCertificate) {
190189
return nil;
191190
}
192-
SIGKeychain *keychain = [SIGKeychain sharedInstance];
193-
if (keychain == nil) {
194-
return nil;
195-
}
196191
CFDataRef issuerName = SecCertificateCopyNormalizedIssuerSequence(_secCertificate);
197192
if (!issuerName) {
198193
return nil;

‎SignedArchive/SignedArchive/SIGIdentity.m

-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#import "SIGCertificate.h"
1212
#import "SIGKey.h"
13-
#import "SIGKeychain.h"
1413
#import "SIGPolicy.h"
1514
#import "SIGTrust.h"
1615

@@ -26,11 +25,6 @@ + (NSDictionary *)queryForSigningIdentities {
2625
}
2726

2827
+ (NSArray<SIGIdentity *> *)allSigningIdentities {
29-
SIGKeychain *keychain = [SIGKeychain sharedInstance];
30-
if (keychain == nil) {
31-
return @[];
32-
}
33-
3428
NSDictionary *query = [self queryForSigningIdentities];
3529

3630
CFTypeRef result = NULL;

‎SignedArchive/SignedArchive/SIGKeychain.h

-23
This file was deleted.

‎SignedArchive/SignedArchive/SIGKeychain.m

-55
This file was deleted.

‎iTerm2.xcodeproj/project.pbxproj

-8
Original file line numberDiff line numberDiff line change
@@ -791,12 +791,10 @@
791791
5370679121C9D2780088D0F3 /* SIGTrust.m in Sources */ = {isa = PBXBuildFile; fileRef = 5370677121C9D2750088D0F3 /* SIGTrust.m */; };
792792
5370679221C9D2780088D0F3 /* SIGIdentity.h in Headers */ = {isa = PBXBuildFile; fileRef = 5370677221C9D2750088D0F3 /* SIGIdentity.h */; };
793793
5370679321C9D2780088D0F3 /* SIGPartialInputStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 5370677321C9D2750088D0F3 /* SIGPartialInputStream.h */; };
794-
5370679421C9D2780088D0F3 /* SIGKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 5370677421C9D2750088D0F3 /* SIGKeychain.m */; };
795794
5370679521C9D2780088D0F3 /* SIGSigningAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 5370677521C9D2760088D0F3 /* SIGSigningAlgorithm.h */; };
796795
5370679621C9D2780088D0F3 /* SIGArchiveBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 5370677621C9D2760088D0F3 /* SIGArchiveBuilder.h */; };
797796
5370679721C9D2780088D0F3 /* SIGArchiveBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5370677721C9D2760088D0F3 /* SIGArchiveBuilder.m */; };
798797
5370679821C9D2780088D0F3 /* SIGSHA2SigningAlgorithm.m in Sources */ = {isa = PBXBuildFile; fileRef = 5370677821C9D2760088D0F3 /* SIGSHA2SigningAlgorithm.m */; };
799-
5370679921C9D2780088D0F3 /* SIGKeychain.h in Headers */ = {isa = PBXBuildFile; fileRef = 5370677921C9D2760088D0F3 /* SIGKeychain.h */; };
800798
5370679A21C9D2780088D0F3 /* SIGArchiveVerifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 5370677A21C9D2760088D0F3 /* SIGArchiveVerifier.h */; };
801799
5370679B21C9D2780088D0F3 /* SIGVerificationAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 5370677B21C9D2770088D0F3 /* SIGVerificationAlgorithm.h */; };
802800
5370679C21C9D2780088D0F3 /* SIGCertificate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5370677C21C9D2770088D0F3 /* SIGCertificate.h */; };
@@ -5041,12 +5039,10 @@
50415039
5370677121C9D2750088D0F3 /* SIGTrust.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SIGTrust.m; path = SignedArchive/SIGTrust.m; sourceTree = "<group>"; };
50425040
5370677221C9D2750088D0F3 /* SIGIdentity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SIGIdentity.h; path = SignedArchive/SIGIdentity.h; sourceTree = "<group>"; };
50435041
5370677321C9D2750088D0F3 /* SIGPartialInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SIGPartialInputStream.h; path = SignedArchive/SIGPartialInputStream.h; sourceTree = "<group>"; };
5044-
5370677421C9D2750088D0F3 /* SIGKeychain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SIGKeychain.m; path = SignedArchive/SIGKeychain.m; sourceTree = "<group>"; };
50455042
5370677521C9D2760088D0F3 /* SIGSigningAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SIGSigningAlgorithm.h; path = SignedArchive/SIGSigningAlgorithm.h; sourceTree = "<group>"; };
50465043
5370677621C9D2760088D0F3 /* SIGArchiveBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SIGArchiveBuilder.h; path = SignedArchive/SIGArchiveBuilder.h; sourceTree = "<group>"; };
50475044
5370677721C9D2760088D0F3 /* SIGArchiveBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SIGArchiveBuilder.m; path = SignedArchive/SIGArchiveBuilder.m; sourceTree = "<group>"; };
50485045
5370677821C9D2760088D0F3 /* SIGSHA2SigningAlgorithm.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SIGSHA2SigningAlgorithm.m; path = SignedArchive/SIGSHA2SigningAlgorithm.m; sourceTree = "<group>"; };
5049-
5370677921C9D2760088D0F3 /* SIGKeychain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SIGKeychain.h; path = SignedArchive/SIGKeychain.h; sourceTree = "<group>"; };
50505046
5370677A21C9D2760088D0F3 /* SIGArchiveVerifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SIGArchiveVerifier.h; path = SignedArchive/SIGArchiveVerifier.h; sourceTree = "<group>"; };
50515047
5370677B21C9D2770088D0F3 /* SIGVerificationAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SIGVerificationAlgorithm.h; path = SignedArchive/SIGVerificationAlgorithm.h; sourceTree = "<group>"; };
50525048
5370677C21C9D2770088D0F3 /* SIGCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SIGCertificate.h; path = SignedArchive/SIGCertificate.h; sourceTree = "<group>"; };
@@ -8987,8 +8983,6 @@
89878983
5370676E21C9D2740088D0F3 /* SIGIdentity.m */,
89888984
5370677D21C9D2770088D0F3 /* SIGKey.h */,
89898985
5370676A21C9D2740088D0F3 /* SIGKey.m */,
8990-
5370677921C9D2760088D0F3 /* SIGKeychain.h */,
8991-
5370677421C9D2750088D0F3 /* SIGKeychain.m */,
89928986
5370677321C9D2750088D0F3 /* SIGPartialInputStream.h */,
89938987
5370676721C9D2730088D0F3 /* SIGPartialInputStream.m */,
89948988
5370676821C9D2730088D0F3 /* SIGPolicy.h */,
@@ -12661,7 +12655,6 @@
1266112655
A66719561DCE36C3000CE608 /* iTermRecentDirectoryMO.h in Headers */,
1266212656
A6556EA91FCB42E0000CC89C /* iTermCharacterSource.h in Headers */,
1266312657
A630117E20E69D43008114B7 /* iTermStatusBarComponentKnob.h in Headers */,
12664-
5370679921C9D2780088D0F3 /* SIGKeychain.h in Headers */,
1266512658
5378FA40224DAE4700CA2B2D /* iTermPreferencesSearch.h in Headers */,
1266612659
A656674F219EA46E005FE60E /* NSNumber+iTerm.h in Headers */,
1266712660
A6EC936F24E787BA00EEADEF /* iTermSnippetsModel.h in Headers */,
@@ -15056,7 +15049,6 @@
1505615049
A6A4866620B676EB00493302 /* GeneralPreferencesViewController.m in Sources */,
1505715050
A6A802EA226ED20800BC70DC /* iTermPrintGuard.m in Sources */,
1505815051
A653F66C24CE7CE30062377E /* iTermGraphEncoder.m in Sources */,
15059-
5370679421C9D2780088D0F3 /* SIGKeychain.m in Sources */,
1506015052
A66319872308C60000C502BD /* NSStringITerm.m in Sources */,
1506115053
5370678A21C9D2780088D0F3 /* SIGKey.m in Sources */,
1506215054
A6F718C62265B2580053488E /* iTermPathCleaner.m in Sources */,

0 commit comments

Comments
 (0)