fix(): follow Rust naming convention

libOctavo · Oct 7, 2015 · 6fbce25 · 6fbce25
1 parent fee9825
commit 6fbce25
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 37 deletions.
diff --git a/examples/sums.rs b/examples/sums.rs
@@ -3,10 +3,10 @@ extern crate octavo;
 use std::io::Write;
 
 use octavo::digest::Digest;
-use octavo::digest::md5::MD5;
-use octavo::digest::md4::MD4;
-use octavo::digest::ripemd::RIPEMD160;
-use octavo::digest::sha1::SHA1;
+use octavo::digest::md5::Md5;
+use octavo::digest::md4::Md4;
+use octavo::digest::ripemd::Ripemd160;
+use octavo::digest::sha1::Sha1;
 use octavo::digest::sha2::*;
 use octavo::digest::sha3::*;
 
@@ -31,16 +31,16 @@ fn main() {
 
     println!("Data: {:?}\n", data);
 
-    println!("MD4:       {}", hex(&data, MD4::default()));
-    println!("MD5:       {}", hex(&data, MD5::default()));
-    println!("RIPEMD160: {}", hex(&data, RIPEMD160::default()));
-    println!("SHA1:      {}", hex(&data, SHA1::default()));
-    println!("SHA224:    {}", hex(&data, SHA224::default()));
-    println!("SHA256:    {}", hex(&data, SHA256::default()));
-    println!("SHA384:    {}", hex(&data, SHA384::default()));
-    println!("SHA512:    {}", hex(&data, SHA512::default()));
-    println!("SHA3-224:  {}", hex(&data, SHA3224::default()));
-    println!("SHA3-256:  {}", hex(&data, SHA3256::default()));
-    println!("SHA3-384:  {}", hex(&data, SHA3384::default()));
-    println!("SHA3-512:  {}", hex(&data, SHA3512::default()));
+    println!("MD4:       {}", hex(&data, Md4::default()));
+    println!("MD5:       {}", hex(&data, Md5::default()));
+    println!("RIPEMD160: {}", hex(&data, Ripemd160::default()));
+    println!("SHA1:      {}", hex(&data, Sha1::default()));
+    println!("SHA224:    {}", hex(&data, Sha224::default()));
+    println!("SHA256:    {}", hex(&data, Sha256::default()));
+    println!("SHA384:    {}", hex(&data, Sha384::default()));
+    println!("SHA512:    {}", hex(&data, Sha512::default()));
+    println!("SHA3-224:  {}", hex(&data, Sha3224::default()));
+    println!("SHA3-256:  {}", hex(&data, Sha3256::default()));
+    println!("SHA3-384:  {}", hex(&data, Sha3384::default()));
+    println!("SHA3-512:  {}", hex(&data, Sha3512::default()));
 }
diff --git a/src/crypto/asymmetric/rsa/mod.rs b/src/crypto/asymmetric/rsa/mod.rs
@@ -27,7 +27,7 @@ impl SecretKeyExtra {
     }
 }
 
-pub enum RSA {
+pub enum Rsa {
     Public {
         /// Modulus
         n: BigUint,
@@ -43,9 +43,9 @@ pub enum RSA {
     }
 }
 
-pub type KeyPair = (RSA, RSA);
+pub type KeyPair = (Rsa, Rsa);
 
-impl RSA {
+impl Rsa {
     pub fn keypair_from_primes<P, Q, E>(p: P, q: Q, e: E) -> KeyPair
         where P: Into<BigUint>, Q: Into<BigUint>, E: Into<BigUint> {
             let (p, q, e) = (p.into(), q.into(), e.into());
@@ -55,11 +55,11 @@ impl RSA {
 
             let d = e.inverse(&phi_n).expect("e is irreversible in ring phi(pq) - error");
 
-            let public = RSA::Public {
+            let public = Rsa::Public {
                 n: n.clone(),
                 e: e
             };
-            let private = RSA::Private {
+            let private = Rsa::Private {
                 n: n,
                 extra: Some(SecretKeyExtra::from_primes(p, q, &d)),
                 d: d,
@@ -86,22 +86,22 @@ impl RSA {
 
     pub fn is_public(&self) -> bool {
         match *self {
-            RSA::Public { .. } => true,
+            Rsa::Public { .. } => true,
             _ => false
         }
     }
 
     pub fn is_private(&self) -> bool {
         match *self {
-            RSA::Private { .. } => true,
+            Rsa::Private { .. } => true,
             _ => false
         }
     }
 
     pub fn crypt(&self, msg: &BigUint) -> BigUint {
         match *self {
-            RSA::Private { ref n, ref d, ref extra } => crypt(msg, n, d, extra.as_ref()),
-            RSA::Public { ref n, ref e } => crypt(msg, n, e, None),
+            Rsa::Private { ref n, ref d, ref extra } => crypt(msg, n, d, extra.as_ref()),
+            Rsa::Public { ref n, ref e } => crypt(msg, n, e, None),
         }
     }
 }
@@ -132,12 +132,12 @@ fn chinese_remainders_power(c: &BigUint, extra: &SecretKeyExtra) -> BigUint {
 
 #[cfg(test)]
 mod tests {
-    use super::RSA;
+    use super::Rsa;
 
     use num::bigint::{ToBigUint};
 
-    fn keys() -> (RSA, RSA) {
-        RSA::keypair_from_primes(
+    fn keys() -> (Rsa, Rsa) {
+        Rsa::keypair_from_primes(
             61.to_biguint().unwrap(),
             53.to_biguint().unwrap(),
             17.to_biguint().unwrap())

diff --git a/src/mac/hmac.rs b/src/mac/hmac.rs
@@ -1,14 +1,14 @@
 use std::io::Write;
 
 use digest::Digest;
-use mac::MAC;
+use mac::Mac;
 
-pub struct HMAC<T: Digest + Default> {
+pub struct Hmac<T: Digest + Default> {
     digest: T,
     key: Vec<u8>,
 }
 
-impl<T: Digest + Default> HMAC<T> {
+impl<T: Digest + Default> Hmac<T> {
     pub fn new<K: AsRef<[u8]>>(key: K) -> Self {
         Self::with_digest(key.as_ref(), Default::default())
     }
@@ -19,7 +19,7 @@ impl<T: Digest + Default> HMAC<T> {
 
         digest.update(&ikey);
 
-        HMAC {
+        Hmac {
             digest: digest,
             key: key,
         }
@@ -42,7 +42,7 @@ impl<T: Digest + Default> HMAC<T> {
 
 }
 
-impl<T: Digest + Default> MAC for HMAC<T> {
+impl<T: Digest + Default> Mac for Hmac<T> {
     fn update<D: AsRef<[u8]>>(&mut self, data: D) {
         self.digest.update(data)
     }
@@ -65,13 +65,13 @@ impl<T: Digest + Default> MAC for HMAC<T> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use mac::MAC;
+    use mac::Mac;
     use digest::Digest;
-    use digest::md5::MD5;
+    use digest::md5::Md5;
 
     #[test]
     fn test_empty_string() {
-        let mut hmac_md5 = HMAC::<MD5>::new("");
+        let mut hmac_md5 = Hmac::<Md5>::new("");
         hmac_md5.update("");
 
         let mut output = [0; 16];

diff --git a/src/mac/mod.rs b/src/mac/mod.rs
@@ -1,6 +1,6 @@
 pub mod hmac;
 
-pub trait MAC: Sized {
+pub trait Mac: Sized {
     fn update<D: AsRef<[u8]>>(&mut self, data: D);
 
     /// Output size in bits