Use SecCertificateCopyKey API when available, falling back in edge ca…

…ses (Kitura#60)
kacatuk · Jan 22, 2020 · 8ea901f · 8ea901f
1 parent 95e3fcd
commit 8ea901f
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 32 deletions.
diff --git a/CryptorRSA.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/CryptorRSA.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/CryptorRSA.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CryptorRSA.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "https://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Sources/CryptorRSA/CryptorRSAKey.swift b/Sources/CryptorRSA/CryptorRSAKey.swift
@@ -321,38 +321,60 @@ extension CryptorRSA {
 			}
 
 			var key: SecKey? = nil
-
-			#if swift(>=4.2)
-
-				if #available(macOS 10.14, iOS 12.0, watchOS 5.0, *) {
-
-					key = SecCertificateCopyKey(certData)
-
-				}
-
-			#endif
-
-			if key == nil {
-
-				#if os(macOS)
-
-					// Now extract the public key from it...
-					let status: OSStatus = withUnsafeMutablePointer(to: &key) { ptr in
-
-						// Retrieves the public key from a certificate...
-						SecCertificateCopyPublicKey(certData, UnsafeMutablePointer(ptr))
-					}
-					if status != errSecSuccess {
-
-						throw Error(code: ERR_EXTRACT_PUBLIC_KEY_FAILED, reason: "Unable to extract public key from data.")
-					}
-
-				#else
-
-					key = SecCertificateCopyPublicKey(certData)
-
-				#endif
-			}
+
+            #if swift(>=4.2)
+                #if os(macOS)
+                    if #available(macOS 10.14, *) {
+                        key = SecCertificateCopyKey(certData)
+                    } else {
+                        // Now extract the public key from it...
+                        let status: OSStatus = withUnsafeMutablePointer(to: &key) { ptr in
+
+                            // Retrieves the public key from a certificate...
+                            SecCertificateCopyPublicKey(certData, UnsafeMutablePointer(ptr))
+                        }
+
+                        if status != errSecSuccess {
+
+                            throw Error(code: ERR_EXTRACT_PUBLIC_KEY_FAILED, reason: "Unable to extract public key from data.")
+                        }
+                    }
+                #else
+                    let copyKey: (SecCertificate) -> SecKey?
+
+                    #if targetEnvironment(macCatalyst)
+                        copyKey = SecCertificateCopyKey
+                    #else
+                        if #available(iOS 12.0, watchOS 5.0, *) {
+                            copyKey = SecCertificateCopyKey
+                        } else {
+                            copyKey = SecCertificateCopyPublicKey
+                        }
+                    #endif
+
+                    key = copyKey(certData)
+                #endif
+            #else
+                #if os(macOS)
+
+                    // Now extract the public key from it...
+                    let status: OSStatus = withUnsafeMutablePointer(to: &key) { ptr in
+
+                        // Retrieves the public key from a certificate...
+                        SecCertificateCopyPublicKey(certData, UnsafeMutablePointer(ptr))
+                    }
+
+                    if status != errSecSuccess {
+
+                        throw Error(code: ERR_EXTRACT_PUBLIC_KEY_FAILED, reason: "Unable to extract public key from data.")
+                    }
+
+                #else
+
+                    key = SecCertificateCopyPublicKey(certData)
+
+                #endif
+            #endif
 
 			guard let createdKey = key else {