Bump elliptic-curve => v0.12.0-pre.4; ecdsa => v0.14.0-pre.5 (#543)

Author: tarcieri

Cargo.lock

@@ -13,18 +13,17 @@ edition = "2021"
 rust-version = "1.57"
 
 [dependencies]
-elliptic-curve = { version = "0.12.0-pre.1", default-features = false, features = ["hazmat", "sec1"] }
-sec1 = { version = "0.2", default-features = false }
+elliptic-curve = { version = "0.12.0-pre.4", default-features = false, features = ["hazmat", "sec1"] }
 
 # optional dependencies
-ecdsa = { version = "0.14.0-pre.2", optional = true, default-features = false, features = ["der"] }
+ecdsa = { version = "0.14.0-pre.5", optional = true, default-features = false, features = ["der"] }
 sha2 = { version = "0.10", optional = true, default-features = false }
 
 [features]
 default = ["pkcs8", "std"]
 pem = ["elliptic-curve/pem", "pkcs8"]
 pkcs8 = ["ecdsa/pkcs8", "elliptic-curve/pkcs8"]
-serde = ["ecdsa/serde", "elliptic-curve/serde", "sec1/serde"]
+serde = ["ecdsa/serde", "elliptic-curve/serde"]
 sha256 = ["ecdsa/digest", "ecdsa/hazmat", "sha2"]
 std = ["elliptic-curve/std"]
 

bp256/Cargo.toml

@@ -29,8 +29,9 @@ impl elliptic_curve::PointCompression for BrainpoolP256r1 {
 }
 
 #[cfg(feature = "pkcs8")]
-impl elliptic_curve::AlgorithmParameters for BrainpoolP256r1 {
-    const OID: pkcs8::ObjectIdentifier = pkcs8::ObjectIdentifier::new("1.3.36.3.3.2.8.1.1.7");
+impl pkcs8::AssociatedOid for BrainpoolP256r1 {
+    const OID: pkcs8::ObjectIdentifier =
+        pkcs8::ObjectIdentifier::new_unwrap("1.3.36.3.3.2.8.1.1.7");
 }
 
 /// brainpoolP256r1 field element serialized as bytes.

bp256/src/r1.rs

@@ -29,8 +29,9 @@ impl elliptic_curve::PointCompression for BrainpoolP256t1 {
 }
 
 #[cfg(feature = "pkcs8")]
-impl elliptic_curve::AlgorithmParameters for BrainpoolP256t1 {
-    const OID: pkcs8::ObjectIdentifier = pkcs8::ObjectIdentifier::new("1.3.36.3.3.2.8.1.1.8");
+impl pkcs8::AssociatedOid for BrainpoolP256t1 {
+    const OID: pkcs8::ObjectIdentifier =
+        pkcs8::ObjectIdentifier::new_unwrap("1.3.36.3.3.2.8.1.1.8");
 }
 
 /// brainpoolP256t1 field element serialized as bytes.

bp256/src/t1.rs

@@ -13,18 +13,17 @@ edition = "2021"
 rust-version = "1.57"
 
 [dependencies]
-elliptic-curve = { version = "0.12.0-pre.1", default-features = false, features = ["hazmat", "sec1"] }
-sec1 = { version = "0.2", default-features = false }
+elliptic-curve = { version = "0.12.0-pre.4", default-features = false, features = ["hazmat", "sec1"] }
 
 # optional dependencies
-ecdsa = { version = "0.14.0-pre.2", optional = true, default-features = false, features = ["der"] }
+ecdsa = { version = "0.14.0-pre.5", optional = true, default-features = false, features = ["der"] }
 sha2 = { version = "0.10", optional = true, default-features = false }
 
 [features]
 default = ["pkcs8", "std"]
 pem = ["elliptic-curve/pem", "pkcs8"]
 pkcs8 = ["ecdsa/pkcs8", "elliptic-curve/pkcs8"]
-serde = ["ecdsa/serde", "elliptic-curve/serde", "sec1/serde"]
+serde = ["ecdsa/serde", "elliptic-curve/serde"]
 sha384 = ["ecdsa/digest", "ecdsa/hazmat", "sha2"]
 std = ["elliptic-curve/std"]
 

bp384/Cargo.toml

@@ -29,8 +29,9 @@ impl elliptic_curve::PointCompression for BrainpoolP384r1 {
 }
 
 #[cfg(feature = "pkcs8")]
-impl elliptic_curve::AlgorithmParameters for BrainpoolP384r1 {
-    const OID: pkcs8::ObjectIdentifier = pkcs8::ObjectIdentifier::new("1.3.36.3.3.2.8.1.1.11");
+impl pkcs8::AssociatedOid for BrainpoolP384r1 {
+    const OID: pkcs8::ObjectIdentifier =
+        pkcs8::ObjectIdentifier::new_unwrap("1.3.36.3.3.2.8.1.1.11");
 }
 
 /// brainpoolP384r1 field element serialized as bytes.

bp384/src/r1.rs

@@ -29,8 +29,9 @@ impl elliptic_curve::PointCompression for BrainpoolP384t1 {
 }
 
 #[cfg(feature = "pkcs8")]
-impl elliptic_curve::AlgorithmParameters for BrainpoolP384t1 {
-    const OID: pkcs8::ObjectIdentifier = pkcs8::ObjectIdentifier::new("1.3.36.3.3.2.8.1.1.12");
+impl pkcs8::AssociatedOid for BrainpoolP384t1 {
+    const OID: pkcs8::ObjectIdentifier =
+        pkcs8::ObjectIdentifier::new_unwrap("1.3.36.3.3.2.8.1.1.12");
 }
 
 /// brainpoolP384t1 field element serialized as bytes.