From 716fe8b64d2b89811e079dc10b7a7bb32a898e08 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 13 Jan 2019 00:20:34 +0000 Subject: [PATCH] Upgraded ring to 0.14 --- Cargo.toml | 2 +- src/crypto.rs | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c9c2e31..bfd72a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ keywords = ["jwt", "web", "api", "token", "json"] serde_json = "1.0" serde_derive = "1.0" serde = "1.0" -ring = { version = "0.13", features = ["rsa_signing", "dev_urandom_fallback"] } +ring = { version = "0.14", features = ["dev_urandom_fallback"] } base64 = "0.9" untrusted = "0.6" chrono = "0.4" diff --git a/src/crypto.rs b/src/crypto.rs index 207897b..0f9008f 100644 --- a/src/crypto.rs +++ b/src/crypto.rs @@ -66,14 +66,12 @@ fn sign_rsa(alg: Algorithm, key: &[u8], signing_input: &str) -> Result { }; let key_pair = Arc::new( - signature::RSAKeyPair::from_der(untrusted::Input::from(key)) + signature::RsaKeyPair::from_der(untrusted::Input::from(key)) .map_err(|_| ErrorKind::InvalidRsaKey)?, ); - let mut signing_state = - signature::RSASigningState::new(key_pair).map_err(|_| ErrorKind::InvalidRsaKey)?; - let mut signature = vec![0; signing_state.key_pair().public_modulus_len()]; + let mut signature = vec![0; key_pair.public_modulus_len()]; let rng = rand::SystemRandom::new(); - signing_state + key_pair .sign(ring_alg, &rng, signing_input.as_bytes(), &mut signature) .map_err(|_| ErrorKind::InvalidRsaKey)?; @@ -98,7 +96,7 @@ pub fn sign(signing_input: &str, key: &[u8], algorithm: Algorithm) -> Result