Update ring requirement from 0.14.6 to 0.16.0

.taskcluster.yml

@@ -12,7 +12,7 @@ tasks:
           - pull_request.synchronize
     payload:
       maxRunTime: 3600
-      image: djmitche/rust-hawk-test:1.35.0@sha256:b4d60deff348ed8091fd1e431ac7d497aa6881b7fcbee56bf6272cb540f4b35a
+      image: djmitche/rust-hawk-test:1.36.0@sha256:b4040d92f34183cf218d222f90e91206ff4fc6ed94d68222fb2b2042a53373a0
       command:
         - /bin/bash
         - '-c'

Cargo.toml

@@ -21,7 +21,7 @@ use_openssl = ["openssl"]
 
 [dependencies]
 base64 = "0.10.1"
-ring = { version = "0.14.6", optional = true }
+ring = { version = "0.16.0", optional = true }
 openssl = { version = "0.10.20", optional = true }
 url = "1.7.2"
 rand = "0.7.0"

docker/rust-hawk-test.sh

@@ -2,4 +2,4 @@
 
 set -e
 
-docker build -t djmitche/rust-hawk-test:1.34.0 rust-hawk-test
+docker build -t djmitche/rust-hawk-test:1.36.0 rust-hawk-test

docker/rust-hawk-test/setup.sh

@@ -20,7 +20,7 @@ chmod +x rustup-init
 ./rustup-init -y --no-modify-path
 
 # install stable
-/root/.cargo/bin/rustup install 1.34.0
+/root/.cargo/bin/rustup install 1.36.0
 /root/.cargo/bin/rustup component add clippy
 /root/.cargo/bin/rustup component add rustfmt
 

src/crypto/ring.rs

@@ -11,14 +11,20 @@ impl From<ring::error::Unspecified> for CryptoError {
     }
 }
 
+impl From<std::convert::Infallible> for CryptoError {
+    fn from(_: std::convert::Infallible) -> Self {
+        unreachable!()
+    }
+}
+
 pub struct RingCryptographer;
 
-struct RingHmacKey(hmac::SigningKey);
+struct RingHmacKey(hmac::Key);
 
 impl HmacKey for RingHmacKey {
     fn sign(&self, data: &[u8]) -> Result<Vec<u8>, CryptoError> {
         let digest = hmac::sign(&self.0, data);
-        let mut mac = vec![0; self.0.digest_algorithm().output_len];
+        let mut mac = vec![0; self.0.algorithm().digest_algorithm().output_len];
         mac.copy_from_slice(digest.as_ref());
         Ok(mac)
     }
@@ -45,7 +51,8 @@ impl Hasher for RingHasher {
 impl Cryptographer for RingCryptographer {
     fn rand_bytes(&self, output: &mut [u8]) -> Result<(), CryptoError> {
         use ring::rand::SecureRandom;
-        ring::rand::SystemRandom.fill(output)?;
+        let rnd = ring::rand::SystemRandom::new();
+        rnd.fill(output)?;
         Ok(())
     }
 
@@ -54,7 +61,7 @@ impl Cryptographer for RingCryptographer {
         algorithm: DigestAlgorithm,
         key: &[u8],
     ) -> Result<Box<dyn HmacKey>, CryptoError> {
-        let k = hmac::SigningKey::new(algorithm.try_into()?, key);
+        let k = hmac::Key::new(algorithm.try_into()?, key);
         Ok(Box::new(RingHmacKey(k)))
     }
 
@@ -79,3 +86,15 @@ impl TryFrom<DigestAlgorithm> for &'static digest::Algorithm {
         }
     }
 }
+
+impl TryFrom<DigestAlgorithm> for hmac::Algorithm {
+    type Error = CryptoError;
+    fn try_from(algorithm: DigestAlgorithm) -> Result<Self, CryptoError> {
+        match algorithm {
+            DigestAlgorithm::Sha256 => Ok(hmac::HMAC_SHA256),
+            DigestAlgorithm::Sha384 => Ok(hmac::HMAC_SHA384),
+            DigestAlgorithm::Sha512 => Ok(hmac::HMAC_SHA512),
+            algo => Err(CryptoError::UnsupportedDigest(algo)),
+        }
+    }
+}