diff --git a/Cargo.lock b/Cargo.lock index 6a56d79..5c36840 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1709,12 +1709,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] -name = "swift-rs-hatter-fork" -version = "1.0.6" +name = "swift-rs" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe20d1d2335bebaf3b637afdbe2754d1e69b04acd0aea41aec73fc4bc96a0ff4" +checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7" dependencies = [ - "base64 0.22.1", + "base64 0.21.7", "serde", "serde_json", ] @@ -1904,7 +1904,7 @@ dependencies = [ "serde_json", "simpledateformat", "spki", - "swift-rs-hatter-fork", + "swift-rs", "tabled", "x25519-dalek", "x509-parser", diff --git a/Cargo.toml b/Cargo.toml index b42bdf4..fe1b90a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ default = ["decrypt", "macos", "smartcard", "secure-enclave"] decrypt = ["smartcard"] smartcard = ["openpgp-card", "openpgp-card-pcsc", "yubikey"] macos = ["security-framework"] -secure-enclave = ["macos", "swift-rs-hatter-fork"] +secure-enclave = ["macos", "swift-rs"] [dependencies] aes-gcm-stream = "0.2" @@ -44,7 +44,7 @@ x25519-dalek = { version = "2.0", features = ["static_secrets", "getrandom"] } x509-parser = "0.16" yubikey = { version = "0.8", features = ["untested"], optional = true } zeroize = "1.7" -swift-rs-hatter-fork = { version = "1.0.6", optional = true } +swift-rs = { version = "1.0.7", optional = true } spki = "0.7" pqcrypto-kyber = "0.8" pqcrypto-traits = "0.3" @@ -54,7 +54,7 @@ dialoguer = "0.11" ctrlc = "3.4" [build-dependencies] -swift-rs-hatter-fork = { version = "1.0.6", features = ["build"], optional = true } +swift-rs = { version = "1.0.7", features = ["build"], optional = true } [profile.release] codegen-units = 1 diff --git a/build.rs b/build.rs index 04c390c..0a53bcf 100644 --- a/build.rs +++ b/build.rs @@ -1,5 +1,5 @@ #[cfg(feature = "secure-enclave")] -use swift_rs_hatter_fork::SwiftLinker; +use swift_rs::SwiftLinker; fn main() { // Ensure this matches the versions set in your `Package.swift` file. diff --git a/src/util_keychainkey.rs b/src/util_keychainkey.rs index a11ac1a..57ac175 100644 --- a/src/util_keychainkey.rs +++ b/src/util_keychainkey.rs @@ -1,6 +1,6 @@ use rust_util::{opt_result, simple_error, XResult}; -use swift_rs_hatter_fork::{Bool, SRString}; -use swift_rs_hatter_fork::swift; +use swift_rs::{Bool, SRString}; +use swift_rs::swift; use crate::util;