X-Git-Url: http://git.euphorik.ch/?p=crypto_lab1.git;a=blobdiff_plain;f=lab1_rust%2Fsrc%2Fcrypto.rs;fp=lab1_rust%2Fsrc%2Fcrypto.rs;h=2e8e046c0bcd19836286907187793b17e9a0f31c;hp=31b224fa4a235c3a7197de7813d1df75dae8b55b;hb=d3d8743586e533af4f32c1edfcff6377161d7cf4;hpb=307b73948c18f26a4ff12fc29f9055397a999f44

diff --git a/lab1_rust/src/crypto.rs b/lab1_rust/src/crypto.rs
index 31b224f..2e8e046 100644
--- a/lab1_rust/src/crypto.rs
+++ b/lab1_rust/src/crypto.rs
@@ -9,7 +9,7 @@ use openssl::crypto::symm;
 static KEY_A: &'static [u8] = [125, 31, 131, 118, 143, 180, 252, 53, 211, 217, 79, 240, 128, 91, 252, 87, 104, 236, 145, 198, 163, 203, 161, 12, 53, 56, 218, 40, 221, 95, 171, 140];
 static KEY_C: &'static [u8] = [75, 226, 88, 31, 223, 216, 182, 216, 178, 58, 59, 193, 245, 80, 254, 128, 125, 246, 246, 224, 194, 190, 123, 123, 10, 131, 217, 183, 112, 157, 166, 102];
 
-/// Only returns the first ten bytes.
+/// Only returns the first ten bytes from HMAC-SHA256.
 pub fn compute_mac(data: &[u8]) -> [u8, ..10] {
    let mut hmac = HMAC(SHA256, KEY_A);
    hmac.update(data);
@@ -18,7 +18,7 @@ pub fn compute_mac(data: &[u8]) -> [u8, ..10] {
    result
 }
 
-/// Encrypt may fail if the provided data size isn't a multiple of 16.
+/// Encrypt may fail if the provided data size isn't a multiple of 16, no padding will be automatically added.
 pub fn encrypt(plaindata: &[u8], iv: &[u8]) -> Option<Vec<u8>> {
    let c = symm::Crypter::new(symm::AES_256_CBC);
    c.init(symm::Encrypt, KEY_C, iv.to_vec());
@@ -32,7 +32,7 @@ pub fn encrypt(plaindata: &[u8], iv: &[u8]) -> Option<Vec<u8>> {
    }
 }
 
-/// Decrypt may fail if the provided data size isn't a multiple of 16.
+/// Decrypt may fail if the provided data size isn't a multiple of 16, no padding will be automatically added.
 pub fn decrypt(cipherdata: &[u8], iv: &[u8]) -> Option<Vec<u8>> {
    let c = symm::Crypter::new(symm::AES_256_CBC);
    c.init(symm::Decrypt, KEY_C, iv.to_vec());