From fc76d67a4f7b6ce537aa69e4c670c71071b1ede0 Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Tue, 15 May 2018 19:31:17 -0700 Subject: deps: upgrade to subtle 0.6 --- src/cookie.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/cookie.rs b/src/cookie.rs index cbd3b89..4a1f77f 100644 --- a/src/cookie.rs +++ b/src/cookie.rs @@ -6,7 +6,7 @@ use consts::COOKIE_REFRESH_TIME; use message::CookieReply; use failure::{Error, err_msg}; use rand::{self, RngCore}; -use subtle; +use subtle::ConstantTimeEq; use std::time::Instant; pub struct ValidatorMac2 { @@ -51,7 +51,7 @@ impl Validator { debug_assert!(mac.len() == 16); let our_mac = blake2s(16, self.mac1_key.as_bytes(), mac_input); - ensure!(subtle::slices_equal(mac, our_mac.as_bytes()) == 1, "mac mismatch"); + ensure!(mac.ct_eq(our_mac.as_bytes()).unwrap_u8() == 1, "mac mismatch"); Ok(()) } @@ -62,7 +62,7 @@ impl Validator { let cookie = blake2s(16, &self.mac2.secret, source); let mac2 = blake2s(16, cookie.as_bytes(), &message[..message.len()-16]); - ensure!(subtle::slices_equal(mac2.as_bytes(), &message[..message.len()-16]) == 1, "mac mismatch"); + ensure!(mac2.as_bytes().ct_eq(&message[..message.len()-16]).unwrap_u8() == 1, "mac mismatch"); Ok(()) } -- cgit v1.2.3-59-g8ed1b