Merge pull request #70 from alex/ring-0.14

Upgraded ring to 0.14
This commit is contained in:
Vincent Prouillet 2019-02-04 18:36:23 +01:00 committed by GitHub
commit cf9908948b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions

View File

@ -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"

View File

@ -66,14 +66,12 @@ fn sign_rsa(alg: Algorithm, key: &[u8], signing_input: &str) -> Result<String> {
};
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<Str
/// See Ring RSA docs for more details
fn verify_rsa(
alg: &signature::RSAParameters,
alg: &signature::RsaParameters,
signature: &str,
signing_input: &str,
key: &[u8],