Merge pull request #54 from mmoadeli/MAID-1058

MAID-1029, MAID-1035, MAID-1041 and MAID-1058

src/helper.rs

@@ -55,12 +55,19 @@ macro_rules! convert_to_array {
 ///
 /// Calculate and returns NameType using Public signing & encryption kets
 ///
-pub fn name(public_keys: &(crypto::sign::PublicKey, crypto::asymmetricbox::PublicKey)) -> NameType {
+pub fn name(public_keys: &(crypto::sign::PublicKey, crypto::asymmetricbox::PublicKey), type_tag: u64,
+    signature: &crypto::sign::Signature) -> NameType {
     let combined_iter = (public_keys.0).0.into_iter().chain((public_keys.1).0.into_iter());
     let mut combined: Vec<u8> = Vec::new();
     for iter in combined_iter {
         combined.push(*iter);
     }
+    for i in type_tag.to_string().into_bytes().into_iter() {
+        combined.push(i);
+    }
+    for i in 1..crypto::sign::SIGNATUREBYTES {
+        combined.push(signature.0[i - 1]);
+    }
     NameType(crypto::hash::sha512::hash(&combined).0)
 }