diff options
author | 林炳权 <695601626@qq.com> | 2024-01-02 06:22:48 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-01 23:22:48 +0100 |
commit | 96b581bdd2bedb31aa51c0a992686f27ed1a1f10 (patch) | |
tree | 3e141ed70531ff37f93eb25d4ae135b97f14b7a1 /ext/crypto | |
parent | 7e72f3af6152d4b62c2ea94d025dfa297a6b0cb4 (diff) |
chore: update to Rust 1.75 (#21731)
Diffstat (limited to 'ext/crypto')
-rw-r--r-- | ext/crypto/import_key.rs | 8 | ||||
-rw-r--r-- | ext/crypto/lib.rs | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ext/crypto/import_key.rs b/ext/crypto/import_key.rs index b939c610c..409ffe7be 100644 --- a/ext/crypto/import_key.rs +++ b/ext/crypto/import_key.rs @@ -563,8 +563,8 @@ fn import_key_ec_jwk( // Import using ring, to validate key let key_alg = match named_curve { - EcNamedCurve::P256 => CryptoNamedCurve::P256.try_into()?, - EcNamedCurve::P384 => CryptoNamedCurve::P256.try_into()?, + EcNamedCurve::P256 => CryptoNamedCurve::P256.into(), + EcNamedCurve::P384 => CryptoNamedCurve::P256.into(), EcNamedCurve::P521 => { return Err(data_error("Unsupported named curve")) } @@ -667,8 +667,8 @@ fn import_key_ec( // 10. if let Some(pk_named_curve) = pk_named_curve { let signing_alg = match pk_named_curve { - EcNamedCurve::P256 => CryptoNamedCurve::P256.try_into()?, - EcNamedCurve::P384 => CryptoNamedCurve::P384.try_into()?, + EcNamedCurve::P256 => CryptoNamedCurve::P256.into(), + EcNamedCurve::P384 => CryptoNamedCurve::P384.into(), EcNamedCurve::P521 => { return Err(data_error("Unsupported named curve")) } diff --git a/ext/crypto/lib.rs b/ext/crypto/lib.rs index 294ade683..5e99e99df 100644 --- a/ext/crypto/lib.rs +++ b/ext/crypto/lib.rs @@ -266,7 +266,7 @@ pub async fn op_crypto_sign_key( } Algorithm::Ecdsa => { let curve: &EcdsaSigningAlgorithm = - args.named_curve.ok_or_else(not_supported)?.try_into()?; + args.named_curve.ok_or_else(not_supported)?.into(); let rng = RingRand::SystemRandom::new(); let key_pair = EcdsaKeyPair::from_pkcs8(curve, &args.key.data, &rng)?; @@ -387,9 +387,9 @@ pub async fn op_crypto_verify_key( } Algorithm::Ecdsa => { let signing_alg: &EcdsaSigningAlgorithm = - args.named_curve.ok_or_else(not_supported)?.try_into()?; + args.named_curve.ok_or_else(not_supported)?.into(); let verify_alg: &EcdsaVerificationAlgorithm = - args.named_curve.ok_or_else(not_supported)?.try_into()?; + args.named_curve.ok_or_else(not_supported)?.into(); let private_key; |