Upgrade ring. (#333)

Author: khuey

Cargo.toml

@@ -15,7 +15,7 @@ rust-version = "1.67.0"
 [dependencies]
 serde_json = "1.0"
 serde = {version = "1.0", features = ["derive"] }
-ring = { version = "0.16.5", features = ["std"] }
+ring = { version = "0.17.3", features = ["std"] }
 base64 = "0.21.0"
 # For PEM decoding
 pem = {version = "2", optional = true}

src/crypto/ecdsa.rs

@@ -31,8 +31,8 @@ pub fn sign(
     key: &[u8],
     message: &[u8],
 ) -> Result<String> {
-    let signing_key = signature::EcdsaKeyPair::from_pkcs8(alg, key)?;
     let rng = rand::SystemRandom::new();
+    let signing_key = signature::EcdsaKeyPair::from_pkcs8(alg, key, &rng)?;
     let out = signing_key.sign(&rng, message)?;
     Ok(b64_encode(out))
 }

src/crypto/rsa.rs

@@ -39,9 +39,9 @@ pub(crate) fn sign(
     message: &[u8],
 ) -> Result<String> {
     let key_pair = signature::RsaKeyPair::from_der(key)
-        .map_err(|e| ErrorKind::InvalidRsaKey(e.description_()))?;
+        .map_err(|e| ErrorKind::InvalidRsaKey(e.to_string()))?;
 
-    let mut signature = vec![0; key_pair.public_modulus_len()];
+    let mut signature = vec![0; key_pair.public().modulus_len()];
     let rng = rand::SystemRandom::new();
     key_pair.sign(alg, &rng, message, &mut signature).map_err(|_| ErrorKind::RsaFailedSigning)?;
 

src/errors.rs

@@ -42,7 +42,7 @@ pub enum ErrorKind {
     /// When the secret given is not a valid ECDSA key
     InvalidEcdsaKey,
     /// When the secret given is not a valid RSA key
-    InvalidRsaKey(&'static str),
+    InvalidRsaKey(String),
     /// We could not sign with the given key
     RsaFailedSigning,
     /// When the algorithm from string doesn't match the one passed to `from_str`