Add swift-certificates. Cleanup swift-crypto. Swift 5.7 and macOS 12.

Basically:
swiftlang#6216
swiftlang#6138
swiftlang#6214

Author: yim-lee

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 
 //===----------------------------------------------------------------------===//
 //
@@ -55,13 +55,6 @@ automatic linking type with `-auto` suffix appended to product's name.
 */
 let autoProducts = [swiftPMProduct, swiftPMDataModelProduct]
 
-let useSwiftCryptoV2 = ProcessInfo.processInfo.environment["SWIFTPM_USE_SWIFT_CRYPTO_V1"] == nil
-let minimumCryptoVersion: Version = useSwiftCryptoV2 ? "2.2.3" : "1.1.7"
-var swiftSettings: [SwiftSetting] = []
-if useSwiftCryptoV2 {
-    swiftSettings.append(.define("CRYPTO_v2"))
-}
-
 var packageCollectionsSigningTargets = [Target]()
 var packageCollectionsSigningDeps: [Target.Dependency] = [
     "Basics",
@@ -96,15 +89,14 @@ packageCollectionsSigningTargets.append(
     .target(
          /** Package collections signing */
          name: "PackageCollectionsSigning",
-         dependencies: packageCollectionsSigningDeps,
-         swiftSettings: swiftSettings
+         dependencies: packageCollectionsSigningDeps
     )
 )
 
 let package = Package(
     name: "SwiftPM",
     platforms: [
-        .macOS("10.15.4"),
+        .macOS(.v12),
         .iOS("13.4")
     ],
     products:
@@ -710,7 +702,7 @@ let relatedDependenciesBranch = "main"
 if ProcessInfo.processInfo.environment["SWIFTPM_LLBUILD_FWK"] == nil {
     if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
         package.dependencies += [
-            .package(url: "https://github.com/apple/swift-llbuild.git", .branch(relatedDependenciesBranch)),
+            .package(url: "https://github.com/apple/swift-llbuild.git", branch: relatedDependenciesBranch),
         ]
     } else {
         // In Swift CI, use a local path to llbuild to interoperate with tools
@@ -724,15 +716,16 @@ if ProcessInfo.processInfo.environment["SWIFTPM_LLBUILD_FWK"] == nil {
 
 if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
     package.dependencies += [
-        .package(url: "https://github.com/apple/swift-tools-support-core.git", .branch(relatedDependenciesBranch)),
+        .package(url: "https://github.com/apple/swift-tools-support-core.git", branch: relatedDependenciesBranch),
         // The 'swift-argument-parser' version declared here must match that
         // used by 'swift-driver' and 'sourcekit-lsp'. Please coordinate
         // dependency version changes here with those projects.
         .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.2")),
-        .package(url: "https://github.com/apple/swift-driver.git", .branch(relatedDependenciesBranch)),
-        .package(url: "https://github.com/apple/swift-crypto.git", .upToNextMinor(from: minimumCryptoVersion)),
+        .package(url: "https://github.com/apple/swift-driver.git", branch: relatedDependenciesBranch),
+        .package(url: "https://github.com/apple/swift-crypto.git", .upToNextMinor(from: "2.3.0")),
         .package(url: "https://github.com/apple/swift-system.git", .upToNextMinor(from: "1.1.1")),
         .package(url: "https://github.com/apple/swift-collections.git", .upToNextMinor(from: "1.0.1")),
+        .package(url: "https://github.com/apple/swift-certificates.git", branch: "main"),
     ]
 } else {
     package.dependencies += [
@@ -742,6 +735,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
         .package(path: "../swift-crypto"),
         .package(path: "../swift-system"),
         .package(path: "../swift-collections"),
+        .package(path: "../swift-certificates"),
     ]
 }
 

Sources/PackageCollectionsSigning/Certificate/Certificate.swift

@@ -113,11 +113,7 @@ struct CoreCertificate {
 
 #elseif os(Linux) || os(Windows) || os(Android)
 final class BoringSSLCertificate {
-    #if CRYPTO_v2
     typealias Pointer = OpaquePointer
-    #else
-    typealias Pointer = UnsafeMutablePointer<X509>
-    #endif
 
     private let underlying: Pointer
 
@@ -203,11 +199,7 @@ final class BoringSSLCertificate {
 }
 
 private extension CertificateName {
-    #if CRYPTO_v2
     typealias Pointer = OpaquePointer
-    #else
-    typealias Pointer = UnsafeMutablePointer<X509_NAME>
-    #endif
 
     init(x509Name: Pointer) {
         func getStringValue(from name: Pointer, of nid: CInt) -> String? {

Sources/PackageCollectionsSigning/Certificate/CertificatePolicy.swift

@@ -102,11 +102,7 @@ extension CertificatePolicy {
     }
 
     #elseif os(Linux) || os(Windows) || os(Android)
-    #if CRYPTO_v2
     typealias BoringSSLVerifyCallback = @convention(c) (CInt, OpaquePointer?) -> CInt
-    #else
-    typealias BoringSSLVerifyCallback = @convention(c) (CInt, UnsafeMutablePointer<X509_STORE_CTX>?) -> CInt
-    #endif
 
     /// Verifies a certificate chain.
     ///