feat: make encryption separate product

tkey · Jan 23, 2024 · 783fece · 783fece
1 parent 59122b7
commit 783fece
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/Package.swift b/Package.swift
@@ -13,6 +13,10 @@ let package = Package(
         .library(
             name: "secp256k1.swift",
             targets: ["secp256k1.swift"]),
+
+        .library(
+            name: "encryption_aes_cbc_sha512.swift",
+            targets: ["encryption_aes_cbc_sha512.swift"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -32,10 +36,16 @@ let package = Package(
         .target(
             name: "secp256k1.swift",
             dependencies: ["curvelib"],
-            path: "Sources/curvelib"
+            path: "Sources/curvelib/secp256k1"
         ),
+        .target(
+            name: "encryption_aes_cbc_sha512.swift",
+            dependencies: ["curvelib", "secp256k1.swift"],
+            path: "Sources/curvelib/encryption"
+        ),
+
         .testTarget(
             name: "curvelibTests",
-            dependencies: ["secp256k1.swift"]),
+            dependencies: ["secp256k1.swift", "encryption_aes_cbc_sha512.swift"]),
     ]
 )
diff --git a/...curvelib/secp256k1/EncryptedMessage.swift → ...urvelib/encryption/EncryptedMessage.swift b/...curvelib/secp256k1/EncryptedMessage.swift → ...urvelib/encryption/EncryptedMessage.swift
@@ -3,6 +3,7 @@ import Foundation
 #if canImport(curvelib)
     import curvelib
 #endif
+import secp256k1_swift
 
 public final class EncryptedMessage {
     private(set) var pointer: OpaquePointer?

diff --git a/Sources/curvelib/secp256k1/Encryption.swift → Sources/curvelib/encryption/Encryption.swift b/Sources/curvelib/secp256k1/Encryption.swift → Sources/curvelib/encryption/Encryption.swift
@@ -3,6 +3,7 @@ import Foundation
 #if canImport(curvelib)
     import curvelib
 #endif
+import secp256k1_swift
 
 public final class Encryption {
     public static func encrypt(pk: PublicKey, plainText: String) throws -> EncryptedMessage {

diff --git a/Sources/curvelib/secp256k1/CurveError.swift b/Sources/curvelib/secp256k1/CurveError.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 public struct CurveError: Error, LocalizedError {
-    enum ErrorType {
+    public enum ErrorType {
         case null
         case convert
         case parse
@@ -17,7 +17,7 @@ public struct CurveError: Error, LocalizedError {
 
     private(set) var type: ErrorType
 
-    init(code: Int32) {
+    public init(code: Int32) {
         switch code {
         case 1: type = .null
         case 2: type = .convert

diff --git a/Sources/curvelib/secp256k1/PublicKey.swift b/Sources/curvelib/secp256k1/PublicKey.swift
@@ -5,9 +5,9 @@ import Foundation
 #endif
 
 public final class PublicKey {
-    private(set) var pointer: OpaquePointer?
+    private(set) public var pointer: OpaquePointer?
 
-    internal init(ptr: OpaquePointer) {
+    public init(ptr: OpaquePointer) {
         pointer = ptr
     }
 

diff --git a/Sources/curvelib/secp256k1/SecretKey.swift b/Sources/curvelib/secp256k1/SecretKey.swift
@@ -5,7 +5,7 @@ import Foundation
 #endif
 
 public final class SecretKey {
-    private(set) var pointer: OpaquePointer?
+    private(set) public var pointer: OpaquePointer?
 
     public init() {
         pointer = curve_secp256k1_private_key_generate()

diff --git a/Tests/curvelibTests/curvelibTests.swift b/Tests/curvelibTests/curvelibTests.swift
@@ -1,5 +1,6 @@
 import XCTest
 import secp256k1_swift
+import encryption_aes_cbc_sha512_swift
 
 final class curvelibTests: XCTestCase {
     func testSecretKey() throws {