From 3c624ad482d8c67de170cdcba93e9ea8f33b3000 Mon Sep 17 00:00:00 2001
From: Thomas Gideon <cmdln@thecommandline.net>
Date: Wed, 15 Feb 2017 13:40:34 -0500
Subject: [PATCH] Rename fn's to be consistent

---
 src/crypt.rs | 19 +++++++------------
 src/lib.rs   |  4 ++--
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/crypt.rs b/src/crypt.rs
index 255d234..4c3d91e 100644
--- a/src/crypt.rs
+++ b/src/crypt.rs
@@ -5,7 +5,7 @@ use openssl::pkey::PKey;
 use openssl::rsa::Rsa;
 use openssl::sign::{Signer, Verifier};
 
-pub fn sign(data: &str, key: &[u8], digest: MessageDigest) -> String {
+pub fn sign_hmac(data: &str, key: &[u8], digest: MessageDigest) -> String {
     let secret_key = PKey::hmac(key).unwrap();
 
     let mut signer = Signer::new(digest, &secret_key).unwrap();
@@ -25,7 +25,7 @@ pub fn sign_rsa(data: &str, key: &[u8], digest: MessageDigest) -> String {
     encode_config(&sig, URL_SAFE)
 }
 
-pub fn verify(target: &str, data: &str, key: &[u8], digest: MessageDigest) -> bool {
+pub fn verify_hmac(target: &str, data: &str, key: &[u8], digest: MessageDigest) -> bool {
     let target_bytes: Vec<u8> = decode_config(target, URL_SAFE).unwrap();
     let secret_key = PKey::hmac(key).unwrap();
 
@@ -48,12 +48,7 @@ pub fn verify_rsa(signature: &str, data: &str, key: &[u8], digest: MessageDigest
 
 #[cfg(test)]
 mod tests {
-    use super::{
-        sign,
-        sign_rsa,
-        verify,
-        verify_rsa
-    };
+    use super::{sign_hmac, sign_rsa, verify_hmac, verify_rsa};
     use std::io::{Error, Read};
     use std::fs::File;
     use openssl::hash::MessageDigest;
@@ -62,13 +57,13 @@ mod tests {
     struct EmptyClaim { }
 
     #[test]
-    pub fn sign_data() {
+    pub fn sign_data_hmac() {
         let header = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9";
         let claims = "eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9";
         let real_sig = "TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ=";
         let data = format!("{}.{}", header, claims);
 
-        let sig = sign(&*data, "secret".as_bytes(), MessageDigest::sha256());
+        let sig = sign_hmac(&*data, "secret".as_bytes(), MessageDigest::sha256());
 
         assert_eq!(sig, real_sig);
     }
@@ -88,13 +83,13 @@ mod tests {
     }
 
     #[test]
-    pub fn verify_data() {
+    pub fn verify_data_hmac() {
         let header = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9";
         let claims = "eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9";
         let target = "TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ";
         let data = format!("{}.{}", header, claims);
 
-        assert!(verify(target, &*data, "secret".as_bytes(), MessageDigest::sha256()));
+        assert!(verify_hmac(target, &*data, "secret".as_bytes(), MessageDigest::sha256()));
     }
 
     #[test]
diff --git a/src/lib.rs b/src/lib.rs
index 778b22c..626e89d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -97,7 +97,7 @@ impl<H, C> Token<H, C>
         let sig = pieces[0];
         let data = pieces[1];
 
-        crypt::verify(sig, data, key, digest)
+        crypt::verify_hmac(sig, data, key, digest)
     }
 
     fn verify_rsa(&self, key: &[u8], digest: MessageDigest) -> bool {
@@ -130,7 +130,7 @@ impl<H, C> Token<H, C>
         let claims = try!(self.claims.to_base64());
         let data = format!("{}.{}", header, claims);
 
-        let sig = crypt::sign(&*data, key, digest);
+        let sig = crypt::sign_hmac(&*data, key, digest);
         Ok(format!("{}.{}", data, sig))
     }