Merge pull request #38 from nanato12/feature/update-hmac-sha256

Update hmac & sha256 crates

Author: nanato12

Cargo.toml

@@ -21,13 +21,13 @@ actix-web = { version = "3", optional = true, default-features = false }
 base64 = "0.21.0"
 bytes = "0.4"
 chrono = "0.4"
-hmac = "0.7.1"
+hmac = "0.12.1"
 reqwest = { version = "0.11.14", features = ["blocking", "json"] }
 rocket = { version = "0.4", optional = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0.156"
 serde_json = "1.0"
-sha2 = "0.8"
+sha2 = "0.10.6"
 
 [dev-dependencies]
 dotenv = "0.15.0"

examples/create_signature.rs

@@ -10,10 +10,10 @@ use sha2::Sha256;
 pub fn create_signature(channel_secret: &str, body: &str) -> String {
     type HmacSha256 = Hmac<Sha256>;
 
-    let mut mac =
-        HmacSha256::new_varkey(channel_secret.as_bytes()).expect("HMAC can take key of any size");
-    mac.input(body.as_bytes());
-    return encode(&mac.result().code().to_vec());
+    let mut mac = HmacSha256::new_from_slice(channel_secret.as_bytes())
+        .expect("HMAC can take key of any size");
+    mac.update(body.as_bytes());
+    return encode(&mac.finalize().into_bytes().to_vec());
 }
 
 fn main() {

examples/echobot_rocket.rs

@@ -20,7 +20,7 @@ use line::support::rocket_support::{Body, Signature};
 fn callback(signature: Signature, body: Body) -> Status {
     // Get channel secret and access token by environment variable
     let channel_secret: &str =
-        &env::var("LINE_CHANNEL_RECRET").expect("Failed getting LINE_CHANNEL_RECRET");
+        &env::var("LINE_CHANNEL_SECRET").expect("Failed getting LINE_CHANNEL_SECRET");
     let access_token: &str =
         &env::var("LINE_CHANNEL_ACCESS_TOKEN").expect("Failed getting LINE_CHANNEL_ACCESS_TOKEN");
 

src/webhook.rs

@@ -18,8 +18,8 @@ use sha2::Sha256;
 pub fn validate_signature(channel_secret: &str, signature: &str, body: &str) -> bool {
     type HmacSha256 = Hmac<Sha256>;
 
-    let mut mac =
-        HmacSha256::new_varkey(channel_secret.as_bytes()).expect("HMAC can take key of any size");
-    mac.input(body.as_bytes());
-    encode(&mac.result().code().to_vec()) == signature
+    let mut mac = HmacSha256::new_from_slice(channel_secret.as_bytes())
+        .expect("HMAC can take key of any size");
+    mac.update(body.as_bytes());
+    encode(&mac.finalize().into_bytes().to_vec()) == signature
 }