Rename _CryptoExtras to CryptoExtras

Package.swift

@@ -79,7 +79,8 @@ let package = Package(
     ],
     products: [
         .library(name: "Crypto", targets: ["Crypto"]),
-        .library(name: "_CryptoExtras", targets: ["_CryptoExtras"]),
+        .library(name: "_CryptoExtras", targets: ["CryptoExtras"]),
+        .library(name: "CryptoExtras", targets: ["CryptoExtras"]),
         /* This target is used only for symbol mangling. It's added and removed automatically because it emits build warnings. MANGLE_START
             .library(name: "CCryptoBoringSSL", type: .static, targets: ["CCryptoBoringSSL"]),
             MANGLE_END */
@@ -138,7 +139,7 @@ let package = Package(
             swiftSettings: swiftSettings
         ),
         .target(
-            name: "_CryptoExtras",
+            name: "CryptoExtras",
             dependencies: [
                 "CCryptoBoringSSL",
                 "CCryptoBoringSSLShims",
@@ -172,7 +173,7 @@ let package = Package(
             ],
             swiftSettings: swiftSettings
         ),
-        .testTarget(name: "_CryptoExtrasTests", dependencies: ["_CryptoExtras"]),
+        .testTarget(name: "CryptoExtrasTests", dependencies: ["CryptoExtras"]),
         .testTarget(name: "CryptoBoringWrapperTests", dependencies: ["CryptoBoringWrapper"]),
     ],
     cxxLanguageStandard: .cxx11

README.md

@@ -34,7 +34,7 @@ When building Swift Crypto for use on Linux, Swift Crypto builds substantially m
 2. The common API of Swift Crypto and CryptoKit.
 3. The backing implementation of this common API, which calls into BoringSSL.
 
-The API code, and some cryptographic primitives which are directly implemented in Swift, are exactly the same for both Apple CryptoKit and Swift Crypto. The backing BoringSSL-based implementation is unique to Swift Crypto.
+The API code, and some cryptographic primitives which are directly implemented in Swift, are exactly the same for both Apple CryptoKit and Swift Crypto. The backing BoringSSL-based implementation is unique to Swift Crypto. In addition, there is another product, `CryptoExtras`, which provides additional functionality that is not offered in CryptoKit, which contains cryptographic APIS predominantly useful in the server ecosystem. **Note**: if you depend on CryptoExtras you'll bundle the BoringSSL implementation of the library in your application, no matter the platform.
 
 ## Evolution
 

Sources/CMakeLists.txt

@@ -16,4 +16,4 @@ add_subdirectory(CCryptoBoringSSL)
 add_subdirectory(CCryptoBoringSSLShims)
 add_subdirectory(CryptoBoringWrapper)
 add_subdirectory(Crypto)
-add_subdirectory(_CryptoExtras)
+add_subdirectory(CryptoExtras)

Sources/_CryptoExtras/CMakeLists.txt → Sources/CryptoExtras/CMakeLists.txt

@@ -12,7 +12,7 @@
 ##
 ##===----------------------------------------------------------------------===##
 
-add_library(_CryptoExtras
+add_library(CryptoExtras
   "ChaCha20CTR/BoringSSL/ChaCha20CTR_boring.swift"
   "ChaCha20CTR/ChaCha20CTR.swift"
   "RSA/RSA+BlindSigning.swift"
@@ -27,23 +27,23 @@ add_library(_CryptoExtras
   "Util/RandomBytes.swift"
   "Util/SubjectPublicKeyInfo.swift")
 
-target_include_directories(_CryptoExtras PRIVATE
+target_include_directories(CryptoExtras PRIVATE
   $<TARGET_PROPERTY:CCryptoBoringSSL,INCLUDE_DIRECTORIES>
   $<TARGET_PROPERTY:CCryptoBoringSSLShims,INCLUDE_DIRECTORIES>)
 
-target_link_libraries(_CryptoExtras PUBLIC
+target_link_libraries(CryptoExtras PUBLIC
   $<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>
   Crypto
   CryptoBoringWrapper
   CCryptoBoringSSL
   CCryptoBoringSSLShims)
 
-target_compile_options(_CryptoExtras PRIVATE ${SWIFT_CRYPTO_COMPILE_OPTIONS})
+target_compile_options(CryptoExtras PRIVATE ${SWIFT_CRYPTO_COMPILE_OPTIONS})
 
-target_link_options(_CryptoExtras PRIVATE
+target_link_options(CryptoExtras PRIVATE
     "$<$<PLATFORM_ID:Darwin>:SHELL:-Xlinker -framework -Xlinker Security>")
 
-set_target_properties(_CryptoExtras PROPERTIES
+set_target_properties(CryptoExtras PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
 
-set_property(GLOBAL APPEND PROPERTY SWIFT_CRYPTO_EXPORTS _CryptoExtras)
+set_property(GLOBAL APPEND PROPERTY SWIFT_CRYPTO_EXPORTS CryptoExtras)

Tests/_CryptoExtrasTests/AES Block Function Tests.swift → Tests/CryptoExtrasTests/AES Block Function Tests.swift

@@ -14,7 +14,7 @@
 import Foundation
 import XCTest
 import Crypto
-import _CryptoExtras
+import CryptoExtras
 
 final class AESBlockFunctionTests: XCTestCase {
     static let nistPlaintextChunks: [[UInt8]] = [

Tests/_CryptoExtrasTests/AES-GCM-SIV-Runner.swift → Tests/CryptoExtrasTests/AES-GCM-SIV-Runner.swift

@@ -14,7 +14,7 @@
 import Foundation
 import XCTest
 import Crypto
-import _CryptoExtras
+import CryptoExtras
 
 struct AEADTestGroup: Codable {
     let ivSize: Int

Tests/_CryptoExtrasTests/AES_CBCTests.swift → Tests/CryptoExtrasTests/AES_CBCTests.swift

@@ -14,7 +14,7 @@
 
 import Crypto
 import Foundation
-import _CryptoExtras
+import CryptoExtras
 import XCTest
 
 final class CBCTests: XCTestCase {

Tests/_CryptoExtrasTests/AES_CFBTests.swift → Tests/CryptoExtrasTests/AES_CFBTests.swift

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Crypto
-@testable import _CryptoExtras
+@testable import CryptoExtras
 import XCTest
 
 final class AES_CFBTests: XCTestCase {

Tests/_CryptoExtrasTests/AES_CTRTests.swift → Tests/CryptoExtrasTests/AES_CTRTests.swift

@@ -14,7 +14,7 @@
 
 import Crypto
 import Foundation
-@testable import _CryptoExtras
+@testable import CryptoExtras
 import XCTest
 
 final class AESCTRTests: XCTestCase {

Tests/_CryptoExtrasTests/ChaCha20CTRTests.swift → Tests/CryptoExtrasTests/ChaCha20CTRTests.swift

@@ -14,7 +14,7 @@
 import Foundation
 import XCTest
 import Crypto
-import _CryptoExtras
+import CryptoExtras
 
 class ChaCha20CTRTests: XCTestCase {
 

Tests/_CryptoExtrasTests/TestRSABlindSigning.swift → Tests/CryptoExtrasTests/TestRSABlindSigning.swift

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 import XCTest
 import Crypto
-@testable import _CryptoExtras
+@testable import CryptoExtras
 
 struct RFC9474TestVector: Codable {
     var name, p, q, n, e, d, msg, msg_prefix, prepared_msg, salt, inv, blinded_msg, blind_sig, sig: String
@@ -42,7 +42,7 @@ struct RFC9474TestVector: Codable {
     }
 
     static let allValues: [Self] = try! RFC9474TestVector.load(from: URL(
-        fileURLWithPath: "../_CryptoExtrasVectors/rfc9474.json",
+        fileURLWithPath: "../CryptoExtrasVectors/rfc9474.json",
         relativeTo: URL(fileURLWithPath: #file)
     ))
 }

Tests/_CryptoExtrasTests/TestRSABlindSigningAPI.swift → Tests/CryptoExtrasTests/TestRSABlindSigningAPI.swift

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 import XCTest
 import Crypto
-import _CryptoExtras  // NOTE: No @testable import, because we want to test the public API.
+import CryptoExtras  // NOTE: No @testable import, because we want to test the public API.
 
 final class TestRSABlindSigningAPI: XCTestCase {
     func testEndToEnd() throws {

Tests/_CryptoExtrasTests/TestRSAEncryption.swift → Tests/CryptoExtrasTests/TestRSAEncryption.swift

@@ -14,7 +14,7 @@
 import Foundation
 import XCTest
 import Crypto
-import _CryptoExtras
+import CryptoExtras
 
 final class TestRSAEncryption: XCTestCase {
 

Tests/_CryptoExtrasTests/TestRSASigning.swift → Tests/CryptoExtrasTests/TestRSASigning.swift

@@ -15,7 +15,7 @@ import Foundation
 import XCTest
 import Crypto
 import CryptoBoringWrapper
-@testable import _CryptoExtras
+@testable import CryptoExtras
 
 final class TestRSASigning: XCTestCase {
 

Tests/_CryptoExtrasTests/Utils/RFCVector.swift → Tests/CryptoExtrasTests/Utils/RFCVector.swift

@@ -26,7 +26,7 @@ struct RFCVectorDecoder {
 
     init(bundleType: AnyObject, fileName: String) throws {
         let testsDirectory: String = URL(fileURLWithPath: "\(#file)").pathComponents.dropLast(3).joined(separator: "/")
-        let fileURL: URL? = URL(fileURLWithPath: "\(testsDirectory)/_CryptoExtrasVectors/\(fileName).txt")
+        let fileURL: URL? = URL(fileURLWithPath: "\(testsDirectory)/CryptoExtrasVectors/\(fileName).txt")
 
         let rfcVectorData = try Data(contentsOf: fileURL!)
         self.rfcVectorData = String(decoding: rfcVectorData, as: Unicode.UTF8.self)

Tests/_CryptoExtrasTests/Utils/Wycheproof.swift → Tests/CryptoExtrasTests/Utils/Wycheproof.swift

@@ -22,7 +22,7 @@ struct WycheproofTest<T: Codable>: Codable {
 extension XCTestCase {
     func wycheproofTest<T: Codable>(jsonName: String, file: StaticString = #file, line: UInt = #line, testFunction: (T) throws -> Void) throws {
         let testsDirectory: String = URL(fileURLWithPath: "\(#file)").pathComponents.dropLast(3).joined(separator: "/")
-        let fileURL: URL? = URL(fileURLWithPath: "\(testsDirectory)/_CryptoExtrasVectors/\(jsonName).json")
+        let fileURL: URL? = URL(fileURLWithPath: "\(testsDirectory)/CryptoExtrasVectors/\(jsonName).json")
 
         let data = try Data(contentsOf: fileURL!)
 

scripts/update-cmake-lists.sh

@@ -93,6 +93,6 @@ update_cmakelists_source "CCryptoBoringSSL"
 update_cmakelists_source "CCryptoBoringSSLShims"
 update_cmakelists_source "CryptoBoringWrapper"
 update_cmakelists_source "Crypto"
-update_cmakelists_source "_CryptoExtras" "*/AES/*.swift"
+update_cmakelists_source "CryptoExtras" "*/AES/*.swift"
 
 update_cmakelists_assembly "CCryptoBoringSSL"