make these functions more useful

1 files changed, 3 insertions, 8 deletions

diff --git a/src/lib.rs b/src/lib.rs
index f2e1508..764fea2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,19 +1,14 @@
 extern crate "rustc-serialize" as serialize;
 
 use serialize::base64::{ToBase64,STANDARD};
-use serialize::hex::{FromHex,ToHex};
 
-pub fn hex_to_base64 (hex: &str) -> String {
-    let bytes = hex.from_hex().unwrap();
+pub fn to_base64 (bytes: &[u8]) -> String {
     return bytes.to_base64(STANDARD);
 }
 
-pub fn fixed_xor (str1: &str, str2: &str) -> String {
-    let bytes1 = str1.from_hex().unwrap();
-    let bytes2 = str2.from_hex().unwrap();
+pub fn fixed_xor (bytes1: &[u8], bytes2: &[u8]) -> Vec<u8> {
     return bytes1.iter()
         .zip(bytes2.iter())
         .map(|(&a, &b)| { a ^ b })
-        .collect::<Vec<u8>>()
-        .to_hex();
+        .collect();
 }