X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=src%2Fcrypto.rs;h=caf34f7cd10b7f2f50ee10ea0e83cbd3416d1ed4;hb=HEAD;hp=a7aa5b98f49faec4b47fd63b112f41eff0d1613e;hpb=c1a5fe1d8e733d744a94acf278903133e2a72115;p=rup.git

diff --git a/src/crypto.rs b/src/crypto.rs
deleted file mode 100644
index a7aa5b9..0000000
--- a/src/crypto.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use openssl::{symm, sha::sha256};
-use rand::prelude::*;
-
-use crate::consts;
-
-#[derive(Debug)]
-pub enum KeyError {
-    UnableToDecodeBase64Key,
-    WrongKeyLength,
-}
-
-#[derive(Debug)]
-pub enum EncryptError {
-    KeyError(KeyError),
-    UnableToEncrypt,
-}
-
-#[derive(Debug)]
-pub enum DecryptError {
-    KeyError(KeyError),
-    WrongMessageVersion,
-    UnableToDecodeBase64Message,
-    UnableToDecrypt,
-    UnableToDecodeMessageAsUTF8String,
-    HashMismatch,
-}
-
-fn decode_key(key: &str) -> Result<Vec<u8>, KeyError> {
-    match base64::decode(key) {
-        Ok(k) => if k.len() != 16 { return Err(KeyError::WrongKeyLength) } else { Ok(k) },
-        Err(_e) => Err(KeyError::UnableToDecodeBase64Key)
-    }
-}
-
-/// Encrypt the given text with the given key. The key length must be 128 bits encoded in base64.
-/// Ouput format: "1" + base_64(<IV> + <hash(message)> + <aes(message)>)
-/// IV: 16 bytes randomized.
-/// Mode : CBC.
-pub fn encrypt(key: &str, plain_text: &str) -> Result<String, EncryptError> {
-    let key_as_bytes = decode_key(key).map_err(|e| EncryptError::KeyError(e))?;
-
-    let text_as_bytes = plain_text.as_bytes();
-    let iv = rand::thread_rng().gen::<[u8; 16]>();
-
-    let cipher_text =
-        symm::encrypt(symm::Cipher::aes_128_cbc(), &key_as_bytes, Some(&iv), text_as_bytes)
-            .map_err(|_e| EncryptError::UnableToEncrypt)?;
-
-    let hash_text = sha256(&text_as_bytes);
-
-    let mut result: Vec<u8> = Vec::new();
-    result.extend(&iv);
-    result.extend(&hash_text);
-    result.extend(&cipher_text);
-
-    Ok(String::from("1") + &base64::encode(&result))
-}
-
-/// Decrypt the given text with the given key. The key length must be 128 bits encoded in base64.
-/// Input format: "1" + base_64(<IV> + <hash(message)> + <aes(message)>)
-pub fn decrypt(key: &str, cipher_text: &str) -> Result<String, DecryptError> {
-    let key_as_bytes = decode_key(key).map_err(|e| DecryptError::KeyError(e))?;
-
-    // Can't decrypt a message with the wrong version.
-    if !cipher_text.starts_with(consts::CURRENT_MESSAGE_VERSION) { return Err(DecryptError::WrongMessageVersion) }
-
-    let cipher_text_bytes =
-        base64::decode(&cipher_text.as_bytes()[consts::CURRENT_MESSAGE_VERSION.as_bytes().len()..])
-            .map_err(|_e| DecryptError::UnableToDecodeBase64Message)?;
-
-    let iv = &cipher_text_bytes[0..16];
-    let hash = &cipher_text_bytes[16..48];
-    let encrypted_message = &cipher_text_bytes[48..];
-
-    let plain_message_bytes =
-        symm::decrypt(symm::Cipher::aes_128_cbc(), &key_as_bytes, Some(iv), encrypted_message)
-            .map_err(|_e| DecryptError::UnableToDecrypt)?;
-
-    if sha256(&plain_message_bytes) != hash { return Err(DecryptError::HashMismatch) }
-
-    let plain_message =
-        String::from_utf8(plain_message_bytes)
-            .map_err(|_e| DecryptError::UnableToDecodeMessageAsUTF8String)?;
-
-    Ok(plain_message)
-}