Merge pull request #34 from hugues31/replace-rust-crypto-crate

Replace rust crypto crate

Author: hugues31

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "coinnect"
-version = "0.4.0"
+version = "0.4.1"
 license = "MIT"
 authors = ["Hugues Gaillard <[email protected]>", "Alejandro Inestal"]
 description = """
@@ -34,9 +34,10 @@ path = "examples/generic_api.rs"
 hyper = "0.10.9"
 serde_json = "1.0.0"
 time = "0.1.37"
-rust-crypto = "0.2"
 hyper-native-tls = "0.2.2"
 lazy_static = "0.2"
 bidir-map = "0.3.2"
 data-encoding = "2.0.0-rc.1"
 error-chain = "0.7.1"
+sha2 = "0.6.0"
+hmac = "0.3"

src/bitstamp/utils.rs

@@ -1,7 +1,7 @@
 use bidir_map::BidirMap;
-use crypto::sha2::Sha256;
-use crypto::hmac::Hmac;
-use crypto::mac::Mac;
+
+use hmac::{Hmac, Mac};
+use sha2::{Sha256};
 
 use serde_json;
 use serde_json::Value;
@@ -58,10 +58,11 @@ pub fn build_signature(nonce: &str,
     const C: &'static [u8] = b"0123456789ABCDEF";
 
     let message = nonce.to_owned() + customer_id + api_key;
-    let mut hmac = Hmac::new(Sha256::new(), api_secret.as_bytes());
 
-    hmac.input(message.as_bytes());
-    let result = hmac.result();
+    let mut mac = Hmac::<Sha256>::new(api_secret.as_bytes());
+
+    mac.input(message.as_bytes());
+    let result = mac.result();
 
     let raw_signature = result.code();
     let mut signature = Vec::with_capacity(raw_signature.len() * 2);

src/kraken/api.rs

@@ -3,10 +3,8 @@
 
 #![allow(too_many_arguments)]
 
-use crypto::digest::Digest;
-use crypto::hmac::Hmac;
-use crypto::mac::Mac;
-use crypto::sha2::{Sha256, Sha512};
+use hmac::{Hmac, Mac};
+use sha2::{Sha256, Sha512, Digest};
 
 use hyper_native_tls::NativeTlsClient;
 use hyper::Client;
@@ -23,7 +21,6 @@ use std::io::Read;
 use std::thread;
 use std::time::Duration;
 use std::str;
-use std::iter::repeat;
 
 use error::*;
 use helpers;
@@ -153,20 +150,20 @@ impl KrakenApi {
     fn create_signature(&self, urlpath: String, postdata: &str, nonce: &str) -> Result<String> {
         let message_presha256 = nonce.to_string() + postdata;
 
-        let mut sha256 = Sha256::new();
-        sha256.input_str(&message_presha256);
-        let mut buffer: Vec<u8> = repeat(0).take((sha256.output_bits() + 7) / 8).collect();
-        sha256.result(&mut buffer);
+        let mut sha256 = Sha256::default();
+        sha256.input(&message_presha256.as_bytes());
+
+        let output = sha256.result();
 
         let mut concatenated = urlpath.as_bytes().to_vec();
-        for elem in buffer {
+        for elem in output {
             concatenated.push(elem);
         }
 
         let hmac_key = BASE64.decode(self.api_secret.as_bytes())?;
-        let mut hmac = Hmac::new(Sha512::new(), &hmac_key);
-        hmac.input(&concatenated);
-        Ok(BASE64.encode(hmac.result().code()))
+        let mut mac = Hmac::<Sha512>::new(&hmac_key[..]);
+        mac.input(&concatenated);
+        Ok(BASE64.encode(mac.result().code()))
     }
 
     /// Result: Server's time

src/lib.rs

@@ -30,7 +30,8 @@
 
 #[macro_use]
 extern crate hyper;
-extern crate crypto;
+extern crate sha2;
+extern crate hmac;
 extern crate hyper_native_tls;
 extern crate serde_json;
 extern crate time;

src/poloniex/api.rs

@@ -1,9 +1,8 @@
 //! Use this module to interact with Poloniex exchange.
 //! See examples for more informations.
 
-use crypto::hmac::Hmac;
-use crypto::mac::Mac;
-use crypto::sha2::Sha512;
+use hmac::{Hmac, Mac};
+use sha2::{Sha512};
 
 use hyper_native_tls::NativeTlsClient;
 use hyper::Client;
@@ -113,10 +112,10 @@ impl PoloniexApi {
         helpers::strip_empties(&mut post_params);
         let post_data = helpers::url_encode_hashmap(&post_params);
 
-        let mut hmac = Hmac::new(Sha512::new(), self.api_secret.as_bytes());
-        hmac.input(post_data.as_bytes());
+        let mut mac = Hmac::<Sha512>::new(self.api_secret.as_bytes());
+        mac.input(post_data.as_bytes());
 
-        let sign = HEXLOWER.encode(hmac.result().code());
+        let sign = HEXLOWER.encode(mac.result().code());
 
         let mut custom_header = header::Headers::new();
         custom_header.set(KeyHeader(self.api_key.to_owned()));