Skip to content

Commit 45a1d80

Browse files
committed
bump rustcrypto dependencies to pre-releases
Signed-off-by: Arthur Gautier <[email protected]>
1 parent 64f57a5 commit 45a1d80

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

cryptoki-rustcrypto/Cargo.toml

+13-13
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ repository = "https://github.com/parallaxsecond/rust-cryptoki"
1212

1313
[dependencies]
1414
cryptoki = { path = "../cryptoki", version = "0.6.1" }
15-
der = "0.7.8"
16-
ecdsa = "0.16.9"
17-
p224 = { version = "0.13.2", features = ["pkcs8"] }
18-
p256 = { version = "0.13.2", features = ["pkcs8"] }
19-
p384 = { version = "0.13.0", features = ["pkcs8"] }
20-
k256 = { version = "0.13.2", features = ["pkcs8"] }
21-
rsa = "0.9.6"
22-
signature = { version = "2.2.0", features = ["derive", "digest"] }
23-
sha1 = { version = "0.10", features = ["oid"] }
24-
sha2 = { version = "0.10", features = ["oid"] }
25-
spki = "0.7.3"
26-
x509-cert = "0.2.4"
15+
der = "=0.8.0-pre.0"
16+
ecdsa = "=0.17.0-pre.5"
17+
p224 = { version = "=0.14.0-pre", features = ["pkcs8"] }
18+
p256 = { version = "=0.14.0-pre.0", features = ["pkcs8"] }
19+
p384 = { version = "=0.14.0-pre", features = ["pkcs8"] }
20+
k256 = { version = "=0.14.0-pre", features = ["pkcs8"] }
21+
rsa = "=0.10.0-pre.1"
22+
signature = { version = "=2.3.0-pre.3", features = ["derive", "digest"] }
23+
sha1 = { version = "=0.11.0-pre.3", features = ["oid"] }
24+
sha2 = { version = "=0.11.0-pre.3", features = ["oid"] }
25+
spki = "=0.8.0-pre.0"
26+
x509-cert = "=0.3.0-pre"
2727
thiserror = "1.0"
2828

2929
[dev-dependencies]
3030
rand = "0.8.5"
3131
serial_test = "0.5.1"
3232
testresult = "0.2.0"
33-
x509-cert = { version = "0.2.4", features = ["builder"] }
33+
x509-cert = { version = "=0.3.0-pre", features = ["builder"] }

cryptoki-rustcrypto/src/ecdsa.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ use der::{
1212
};
1313
use ecdsa::{
1414
elliptic_curve::{
15-
generic_array::ArrayLength,
15+
array::ArraySize,
1616
ops::Invert,
1717
point::PointCompression,
1818
sec1::{FromEncodedPoint, ModulusSize, ToEncodedPoint},
1919
subtle::CtOption,
2020
AffinePoint, CurveArithmetic, FieldBytesSize, PublicKey, Scalar, SecretKey,
2121
},
22-
hazmat::{DigestPrimitive, SignPrimitive},
22+
hazmat::DigestPrimitive,
2323
PrimeCurve, Signature, SignatureSize, VerifyingKey,
2424
};
2525
use signature::{digest::Digest, DigestSigner};
@@ -76,8 +76,8 @@ where
7676
impl<C> CryptokiImport for SecretKey<C>
7777
where
7878
C: PrimeCurve + CurveArithmetic,
79-
Scalar<C>: Invert<Output = CtOption<Scalar<C>>> + SignPrimitive<C>,
80-
SignatureSize<C>: ArrayLength<u8>,
79+
Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
80+
SignatureSize<C>: ArraySize,
8181

8282
C: AssociatedOid,
8383
{
@@ -232,7 +232,7 @@ impl<C: SignAlgorithm, S: SessionLike> signature::Keypair for Signer<C, S> {
232232

233233
impl<C: SignAlgorithm, S: SessionLike> DigestSigner<C::Digest, Signature<C>> for Signer<C, S>
234234
where
235-
<<C as ecdsa::elliptic_curve::Curve>::FieldBytesSize as Add>::Output: ArrayLength<u8>,
235+
<<C as ecdsa::elliptic_curve::Curve>::FieldBytesSize as Add>::Output: ArraySize,
236236
{
237237
fn try_sign_digest(&self, digest: C::Digest) -> Result<Signature<C>, signature::Error> {
238238
let msg = digest.finalize();
@@ -265,8 +265,8 @@ where
265265
impl<C: SignAlgorithm, S: SessionLike> DigestSigner<C::Digest, ecdsa::der::Signature<C>>
266266
for Signer<C, S>
267267
where
268-
ecdsa::der::MaxSize<C>: ArrayLength<u8>,
269-
<FieldBytesSize<C> as Add>::Output: Add<ecdsa::der::MaxOverhead> + ArrayLength<u8>,
268+
ecdsa::der::MaxSize<C>: ArraySize,
269+
<FieldBytesSize<C> as Add>::Output: Add<ecdsa::der::MaxOverhead> + ArraySize,
270270
Self: DigestSigner<C::Digest, Signature<C>>,
271271
{
272272
fn try_sign_digest(

0 commit comments

Comments
 (0)