Merge branch 'master' into 'prod'

v0.1.1-rc.2

See merge request huangjj27/tls_sig_api!9

Author: huangjj27

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tls_sig_api"
-version = "0.1.1-rc.1"
+version = "0.1.1-rc.2"
 authors = ["huangjj27 <huangjj.27@qq.com>"]
 edition = "2018"
 license = "MIT"
@@ -19,7 +19,8 @@ gitlab = { repository = "https://gitlab.com/huangjj27/tls_sig_api", branch = "pr
 
 [dependencies]
 base64 = "0.10"
-ring = "0.16"
+hmac = "0.7"
+sha2 = "0.8"
 serde_json = { version = "1.0", features = ["preserve_order"] }
 deflate =  "0.8"
 chrono =  "0.4"

src/lib.rs

@@ -1,7 +1,8 @@
 use chrono::{DateTime, Duration, Utc};
 use deflate::{deflate_bytes_zlib_conf, Compression};
 use log::*;
-use ring::hmac;
+use sha2::Sha256;
+use hmac::{Hmac, Mac};
 use serde_json::json;
 
 pub struct TlsSigApiVer2 {
@@ -108,8 +109,10 @@ impl TlsSigApiVer2 {
 
         debug!("raw_content_to_be_signed: {}", raw_content_to_be_signed);
 
-        let key = hmac::Key::new(hmac::HMAC_SHA256, self.secret.as_bytes());
-        let digest = hmac::sign(&key, raw_content_to_be_signed.as_bytes());
+        let mut mac = Hmac::<Sha256>::new_varkey(self.secret.as_bytes())
+            .expect("HMAC can take key of any size");
+        mac.input(raw_content_to_be_signed.as_bytes());
+        let digest = mac.result().code();
 
         base64::encode_config(digest.as_ref(), base64::STANDARD)
     }