From 45a1d8092a6b3764ce223d8ccc8726a82e6e5d7c Mon Sep 17 00:00:00 2001
From: Arthur Gautier <baloo@superbaloo.net>
Date: Wed, 5 Jun 2024 10:48:40 -0700
Subject: [PATCH] bump rustcrypto dependencies to pre-releases

Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
---
 cryptoki-rustcrypto/Cargo.toml   | 26 +++++++++++++-------------
 cryptoki-rustcrypto/src/ecdsa.rs | 14 +++++++-------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/cryptoki-rustcrypto/Cargo.toml b/cryptoki-rustcrypto/Cargo.toml
index d00d2097..2a04f442 100644
--- a/cryptoki-rustcrypto/Cargo.toml
+++ b/cryptoki-rustcrypto/Cargo.toml
@@ -12,22 +12,22 @@ repository = "https://github.com/parallaxsecond/rust-cryptoki"
 
 [dependencies]
 cryptoki = { path = "../cryptoki", version = "0.6.1" }
-der = "0.7.8"
-ecdsa = "0.16.9"
-p224 = { version = "0.13.2", features = ["pkcs8"] }
-p256 = { version = "0.13.2", features = ["pkcs8"] }
-p384 = { version = "0.13.0", features = ["pkcs8"] }
-k256 = { version = "0.13.2", features = ["pkcs8"] }
-rsa = "0.9.6"
-signature = { version = "2.2.0", features = ["derive", "digest"] }
-sha1 = { version = "0.10", features = ["oid"] }
-sha2 = { version = "0.10", features = ["oid"] }
-spki = "0.7.3"
-x509-cert = "0.2.4"
+der = "=0.8.0-pre.0"
+ecdsa = "=0.17.0-pre.5"
+p224 = { version = "=0.14.0-pre", features = ["pkcs8"] }
+p256 = { version = "=0.14.0-pre.0", features = ["pkcs8"] }
+p384 = { version = "=0.14.0-pre", features = ["pkcs8"] }
+k256 = { version = "=0.14.0-pre", features = ["pkcs8"] }
+rsa = "=0.10.0-pre.1"
+signature = { version = "=2.3.0-pre.3", features = ["derive", "digest"] }
+sha1 = { version = "=0.11.0-pre.3", features = ["oid"] }
+sha2 = { version = "=0.11.0-pre.3", features = ["oid"] }
+spki = "=0.8.0-pre.0"
+x509-cert = "=0.3.0-pre"
 thiserror = "1.0"
 
 [dev-dependencies]
 rand = "0.8.5"
 serial_test = "0.5.1"
 testresult = "0.2.0"
-x509-cert = { version = "0.2.4", features = ["builder"] }
+x509-cert = { version = "=0.3.0-pre", features = ["builder"] }
diff --git a/cryptoki-rustcrypto/src/ecdsa.rs b/cryptoki-rustcrypto/src/ecdsa.rs
index 7885cc08..2214a76b 100644
--- a/cryptoki-rustcrypto/src/ecdsa.rs
+++ b/cryptoki-rustcrypto/src/ecdsa.rs
@@ -12,14 +12,14 @@ use der::{
 };
 use ecdsa::{
     elliptic_curve::{
-        generic_array::ArrayLength,
+        array::ArraySize,
         ops::Invert,
         point::PointCompression,
         sec1::{FromEncodedPoint, ModulusSize, ToEncodedPoint},
         subtle::CtOption,
         AffinePoint, CurveArithmetic, FieldBytesSize, PublicKey, Scalar, SecretKey,
     },
-    hazmat::{DigestPrimitive, SignPrimitive},
+    hazmat::DigestPrimitive,
     PrimeCurve, Signature, SignatureSize, VerifyingKey,
 };
 use signature::{digest::Digest, DigestSigner};
@@ -76,8 +76,8 @@ where
 impl<C> CryptokiImport for SecretKey<C>
 where
     C: PrimeCurve + CurveArithmetic,
-    Scalar<C>: Invert<Output = CtOption<Scalar<C>>> + SignPrimitive<C>,
-    SignatureSize<C>: ArrayLength<u8>,
+    Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
+    SignatureSize<C>: ArraySize,
 
     C: AssociatedOid,
 {
@@ -232,7 +232,7 @@ impl<C: SignAlgorithm, S: SessionLike> signature::Keypair for Signer<C, S> {
 
 impl<C: SignAlgorithm, S: SessionLike> DigestSigner<C::Digest, Signature<C>> for Signer<C, S>
 where
-    <<C as ecdsa::elliptic_curve::Curve>::FieldBytesSize as Add>::Output: ArrayLength<u8>,
+    <<C as ecdsa::elliptic_curve::Curve>::FieldBytesSize as Add>::Output: ArraySize,
 {
     fn try_sign_digest(&self, digest: C::Digest) -> Result<Signature<C>, signature::Error> {
         let msg = digest.finalize();
@@ -265,8 +265,8 @@ where
 impl<C: SignAlgorithm, S: SessionLike> DigestSigner<C::Digest, ecdsa::der::Signature<C>>
     for Signer<C, S>
 where
-    ecdsa::der::MaxSize<C>: ArrayLength<u8>,
-    <FieldBytesSize<C> as Add>::Output: Add<ecdsa::der::MaxOverhead> + ArrayLength<u8>,
+    ecdsa::der::MaxSize<C>: ArraySize,
+    <FieldBytesSize<C> as Add>::Output: Add<ecdsa::der::MaxOverhead> + ArraySize,
     Self: DigestSigner<C::Digest, Signature<C>>,
 {
     fn try_sign_digest(