diff --git a/SecretAgent/Agent.swift b/SecretAgent/Agent.swift index 617ebe8..2ee5908 100644 --- a/SecretAgent/Agent.swift +++ b/SecretAgent/Agent.swift @@ -102,10 +102,6 @@ extension Agent { rawRepresentation = try CryptoKit.P256.Signing.ECDSASignature(derRepresentation: derSignature).rawRepresentation case (.ellipticCurve, 384): rawRepresentation = try CryptoKit.P384.Signing.ECDSASignature(derRepresentation: derSignature).rawRepresentation - case (.rsa, 1024): - fatalError() - case (.rsa, 2048): - fatalError() default: fatalError() } diff --git a/SecretKit/Common/OpenSSH/OpenSSHKeyWriter.swift b/SecretKit/Common/OpenSSH/OpenSSHKeyWriter.swift index 9d2a6a5..b4d172a 100644 --- a/SecretKit/Common/OpenSSH/OpenSSHKeyWriter.swift +++ b/SecretKit/Common/OpenSSH/OpenSSHKeyWriter.swift @@ -37,8 +37,6 @@ extension OpenSSHKeyWriter { switch algorithm { case .ellipticCurve: return "nistp" + String(describing: length) - case .rsa: - return "ssh-rsa" } } @@ -46,8 +44,6 @@ extension OpenSSHKeyWriter { switch algorithm { case .ellipticCurve: return "ecdsa-sha2-nistp" + String(describing: length) - case .rsa: - return "ssh-rsa" } } } diff --git a/SecretKit/Secret.swift b/SecretKit/Secret.swift index dd65cee..7e54b4c 100644 --- a/SecretKit/Secret.swift +++ b/SecretKit/Secret.swift @@ -8,14 +8,12 @@ public protocol Secret: Identifiable, Hashable { } public enum Algorithm { - case ellipticCurve, rsa + case ellipticCurve public init(secAttr: NSNumber) { let secAttrString = secAttr.stringValue as CFString switch secAttrString { case kSecAttrKeyTypeEC: self = .ellipticCurve - case kSecAttrKeyTypeRSA: - self = .rsa default: fatalError() } diff --git a/SecretKit/SmartCard/SmartCardStore.swift b/SecretKit/SmartCard/SmartCardStore.swift index a89032e..08e10d7 100644 --- a/SecretKit/SmartCard/SmartCardStore.swift +++ b/SecretKit/SmartCard/SmartCardStore.swift @@ -67,8 +67,6 @@ extension SmartCard { signatureAlgorithm = .ecdsaSignatureMessageX962SHA256 case (.ellipticCurve, 384): signatureAlgorithm = .ecdsaSignatureMessageX962SHA384 - case (.rsa, _): - signatureAlgorithm = .rsaSignatureRaw default: fatalError() } @@ -102,6 +100,7 @@ extension SmartCard.Store { let attributes = [ kSecClass: kSecClassKey, kSecAttrTokenID: tokenID, + kSecAttrKeyType: kSecAttrKeyTypeEC, // Restrict to EC kSecReturnRef: true, kSecMatchLimit: kSecMatchLimitAll, kSecReturnAttributes: true