fix pkcs8 api break (#1075)

RustCrypto · Sep 7, 2024 · 75ba087 · 75ba087
1 parent 4781762
commit 75ba087
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,3 +17,7 @@ members = [
 
 [profile.dev]
 opt-level = 2
+
+[patch.crates-io]
+ecdsa = { git = "https://github.com/RustCrypto/signatures.git" }
+rfc6979 = { git = "https://github.com/RustCrypto/signatures.git" }
diff --git a/bign256/Cargo.toml b/bign256/Cargo.toml
@@ -18,7 +18,7 @@ edition = "2021"
 rust-version = "1.73"
 
 [dependencies]
-elliptic-curve = { version = "=0.14.0-pre.6", features = ["sec1"] }
+elliptic-curve = { version = "0.14.0-rc.0", features = ["sec1"] }
 
 # optional dependencies
 belt-hash = { version = "=0.2.0-pre.4", optional = true, default-features = false }
@@ -29,9 +29,9 @@ hkdf = { version = "=0.13.0-pre.4", optional = true }
 hmac = { version = "=0.13.0-pre.4", optional = true }
 rand_core = "0.6.4"
 rfc6979 = { version = "=0.5.0-pre.4", optional = true }
-pkcs8 = { version = "0.11.0-rc.0", optional = true }
+pkcs8 = { version = "0.11.0-rc.1", optional = true }
 primeorder = { version = "=0.14.0-pre.1", optional = true, path = "../primeorder" }
-sec1 = { version = "0.8.0-rc.0", optional = true }
+sec1 = { version = "0.8.0-rc.1", optional = true }
 signature = { version = "=2.3.0-pre.4", optional = true }
 
 [dev-dependencies]

diff --git a/bign256/src/secret_key.rs b/bign256/src/secret_key.rs
@@ -1,7 +1,7 @@
 //! Bign256 secret key.
 
 use core::str::FromStr;
-use der::SecretDocument;
+use der::{asn1::OctetStringRef, SecretDocument};
 
 use elliptic_curve::{array::typenum::Unsigned, zeroize::Zeroizing, Error};
 use pkcs8::{
@@ -129,14 +129,15 @@ impl AssociatedAlgorithmIdentifier for SecretKey {
  };
 }
 
-impl TryFrom<pkcs8::PrivateKeyInfo<'_>> for SecretKey {
+impl TryFrom<pkcs8::PrivateKeyInfoRef<'_>> for SecretKey {
  type Error = pkcs8::Error;
 
- fn try_from(private_key_info: pkcs8::PrivateKeyInfo<'_>) -> pkcs8::Result<Self> {
+ fn try_from(private_key_info: pkcs8::PrivateKeyInfoRef<'_>) -> pkcs8::Result<Self> {
  private_key_info
  .algorithm
  .assert_oids(ALGORITHM_OID, BignP256::OID)?;
- Self::from_slice(private_key_info.private_key).map_err(|_| pkcs8::Error::KeyMalformed)
+ Self::from_slice(private_key_info.private_key.as_bytes())
+ .map_err(|_| pkcs8::Error::KeyMalformed)
  }
 }
 
@@ -156,7 +157,10 @@ impl EncodePrivateKey for SecretKey {
  };
 
  let ec_private_key = self.to_bytes();
- let pkcs8_key = pkcs8::PrivateKeyInfo::new(algorithm_identifier, &ec_private_key);
+ let pkcs8_key = pkcs8::PrivateKeyInfoRef::new(
+ algorithm_identifier,
+ OctetStringRef::new(&ec_private_key)?,
+ );
  Ok(SecretDocument::encode_msg(&pkcs8_key)?)
  }
 }
diff --git a/bp256/Cargo.toml b/bp256/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2021"
 rust-version = "1.73"
 
 [dependencies]
-elliptic-curve = { version = "=0.14.0-pre.6", default-features = false, features = ["sec1"] }
+elliptic-curve = { version = "0.14.0-rc.0", default-features = false, features = ["sec1"] }
 
 # optional dependencies
 ecdsa = { version = "=0.17.0-pre.7", optional = true, default-features = false, features = ["der"] }

diff --git a/bp384/Cargo.toml b/bp384/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2021"
 rust-version = "1.73"
 
 [dependencies]
-elliptic-curve = { version = "=0.14.0-pre.6", default-features = false, features = ["sec1"] }
+elliptic-curve = { version = "0.14.0-rc.0", default-features = false, features = ["sec1"] }
 
 # optional dependencies
 ecdsa = { version = "=0.17.0-pre.7", optional = true, default-features = false, features = ["der"] }

diff --git a/k256/Cargo.toml b/k256/Cargo.toml
@@ -20,7 +20,7 @@ rust-version = "1.73"
 
 [dependencies]
 cfg-if = "1.0"
-elliptic-curve = { version = "=0.14.0-pre.6", default-features = false, features = ["sec1"] }
+elliptic-curve = { version = "0.14.0-rc.0", default-features = false, features = ["sec1"] }
 
 # optional dependencies
 once_cell = { version = "1.19", optional = true, default-features = false }

diff --git a/p192/Cargo.toml b/p192/Cargo.toml
@@ -17,8 +17,8 @@ edition = "2021"
 rust-version = "1.73"
 
 [dependencies]
-elliptic-curve = { version = "=0.14.0-pre.6", default-features = false, features = ["sec1"] }
-sec1 = { version = "0.8.0-rc.0", default-features = false }
+elliptic-curve = { version = "0.14.0-rc.0", default-features = false, features = ["sec1"] }
+sec1 = { version = "0.8.0-rc.1", default-features = false }
 
 # optional dependencies
 ecdsa-core = { version = "=0.17.0-pre.7", package = "ecdsa", optional = true, default-features = false, features = ["der"] }

diff --git a/p224/Cargo.toml b/p224/Cargo.toml
@@ -17,7 +17,7 @@ edition = "2021"
 rust-version = "1.73"
 
 [dependencies]
-elliptic-curve = { version = "=0.14.0-pre.6", default-features = false, features = ["sec1"] }
+elliptic-curve = { version = "0.14.0-rc.0", default-features = false, features = ["sec1"] }
 
 # optional dependencies
 ecdsa-core = { version = "=0.17.0-pre.7", package = "ecdsa", optional = true, default-features = false, features = ["der"] }

diff --git a/p256/Cargo.toml b/p256/Cargo.toml
@@ -18,7 +18,7 @@ edition = "2021"
 rust-version = "1.73"
 
 [dependencies]
-elliptic-curve = { version = "=0.14.0-pre.6", default-features = false, features = ["sec1"] }
+elliptic-curve = { version = "0.14.0-rc.0", default-features = false, features = ["sec1"] }
 
 # optional dependencies
 ecdsa-core = { version = "=0.17.0-pre.7", package = "ecdsa", optional = true, default-features = false, features = ["der"] }

diff --git a/p384/Cargo.toml b/p384/Cargo.toml
@@ -18,7 +18,7 @@ edition = "2021"
 rust-version = "1.73"
 
 [dependencies]
-elliptic-curve = { version = "=0.14.0-pre.6", default-features = false, features = ["sec1"] }
+elliptic-curve = { version = "0.14.0-rc.0", default-features = false, features = ["sec1"] }
 
 # optional dependencies
 ecdsa-core = { version = "=0.17.0-pre.7", package = "ecdsa", optional = true, default-features = false, features = ["der"] }

diff --git a/p521/Cargo.toml b/p521/Cargo.toml
@@ -18,7 +18,7 @@ rust-version = "1.73"
 
 [dependencies]
 base16ct = "0.2"
-elliptic-curve = { version = "=0.14.0-pre.6", default-features = false, features = ["sec1"] }
+elliptic-curve = { version = "0.14.0-rc.0", default-features = false, features = ["sec1"] }
 
 # optional dependencies
 ecdsa-core = { version = "=0.17.0-pre.7", package = "ecdsa", optional = true, default-features = false, features = ["der"] }

diff --git a/primeorder/Cargo.toml b/primeorder/Cargo.toml
@@ -18,7 +18,7 @@ edition = "2021"
 rust-version = "1.73"
 
 [dependencies]
-elliptic-curve = { version = "=0.14.0-pre.6", default-features = false, features = ["arithmetic", "sec1"] }
+elliptic-curve = { version = "0.14.0-rc.0", default-features = false, features = ["arithmetic", "sec1"] }
 
 # optional dependencies
 serdect = { version = "0.2", optional = true, default-features = false }

diff --git a/sm2/Cargo.toml b/sm2/Cargo.toml
@@ -18,7 +18,7 @@ edition = "2021"
 rust-version = "1.73"
 
 [dependencies]
-elliptic-curve = { version = "=0.14.0-pre.6", default-features = false, features = ["sec1"] }
+elliptic-curve = { version = "0.14.0-rc.0", default-features = false, features = ["sec1"] }
 
 # optional dependencies
 primeorder = { version = "=0.14.0-pre.1", optional = true, path = "../primeorder" }