aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/crypto/symm.rs
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/src/crypto/symm.rs')
-rw-r--r--openssl/src/crypto/symm.rs130
1 files changed, 64 insertions, 66 deletions
diff --git a/openssl/src/crypto/symm.rs b/openssl/src/crypto/symm.rs
index bc4b65b5..c0e845dc 100644
--- a/openssl/src/crypto/symm.rs
+++ b/openssl/src/crypto/symm.rs
@@ -1,5 +1,5 @@
use std::iter::repeat;
-use libc::{c_int};
+use libc::c_int;
use crypto::symm_internal::evpc;
use ffi;
@@ -20,7 +20,7 @@ pub enum Type {
AES_128_XTS,
#[cfg(feature = "aes_ctr")]
AES_128_CTR,
- //AES_128_GCM,
+ // AES_128_GCM,
AES_128_CFB1,
AES_128_CFB128,
AES_128_CFB8,
@@ -32,7 +32,7 @@ pub enum Type {
AES_256_XTS,
#[cfg(feature = "aes_ctr")]
AES_256_CTR,
- //AES_256_GCM,
+ // AES_256_GCM,
AES_256_CFB1,
AES_256_CFB128,
AES_256_CFB8,
@@ -55,7 +55,12 @@ impl Crypter {
let ctx = unsafe { ffi::EVP_CIPHER_CTX_new() };
let (evp, keylen, blocksz) = evpc(t);
- Crypter { evp: evp, ctx: ctx, keylen: keylen, blocksize: blocksz }
+ Crypter {
+ evp: evp,
+ ctx: ctx,
+ keylen: keylen,
+ blocksize: blocksz,
+ }
}
/**
@@ -65,7 +70,11 @@ impl Crypter {
pub fn pad(&self, padding: bool) {
if self.blocksize > 0 {
unsafe {
- let v = if padding { 1 as c_int } else { 0 };
+ let v = if padding {
+ 1 as c_int
+ } else {
+ 0
+ };
ffi::EVP_CIPHER_CTX_set_padding(self.ctx, v);
}
}
@@ -82,13 +91,7 @@ impl Crypter {
};
assert_eq!(key.len(), self.keylen as usize);
- ffi::EVP_CipherInit(
- self.ctx,
- self.evp,
- key.as_ptr(),
- iv.as_ptr(),
- mode
- );
+ ffi::EVP_CipherInit(self.ctx, self.evp, key.as_ptr(), iv.as_ptr(), mode);
}
}
@@ -102,13 +105,11 @@ impl Crypter {
let mut res = repeat(0u8).take(sum).collect::<Vec<_>>();
let mut reslen = sum as c_int;
- ffi::EVP_CipherUpdate(
- self.ctx,
- res.as_mut_ptr(),
- &mut reslen,
- data.as_ptr(),
- data.len() as c_int
- );
+ ffi::EVP_CipherUpdate(self.ctx,
+ res.as_mut_ptr(),
+ &mut reslen,
+ data.as_ptr(),
+ data.len() as c_int);
res.truncate(reslen as usize);
res
@@ -123,9 +124,7 @@ impl Crypter {
let mut res = repeat(0u8).take(self.blocksize as usize).collect::<Vec<_>>();
let mut reslen = self.blocksize as c_int;
- ffi::EVP_CipherFinal(self.ctx,
- res.as_mut_ptr(),
- &mut reslen);
+ ffi::EVP_CipherFinal(self.ctx, res.as_mut_ptr(), &mut reslen);
res.truncate(reslen as usize);
res
@@ -175,17 +174,14 @@ mod tests {
// http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
#[test]
fn test_aes_256_ecb() {
- let k0 =
- [0x00u8, 0x01u8, 0x02u8, 0x03u8, 0x04u8, 0x05u8, 0x06u8, 0x07u8,
- 0x08u8, 0x09u8, 0x0au8, 0x0bu8, 0x0cu8, 0x0du8, 0x0eu8, 0x0fu8,
- 0x10u8, 0x11u8, 0x12u8, 0x13u8, 0x14u8, 0x15u8, 0x16u8, 0x17u8,
- 0x18u8, 0x19u8, 0x1au8, 0x1bu8, 0x1cu8, 0x1du8, 0x1eu8, 0x1fu8];
- let p0 =
- [0x00u8, 0x11u8, 0x22u8, 0x33u8, 0x44u8, 0x55u8, 0x66u8, 0x77u8,
- 0x88u8, 0x99u8, 0xaau8, 0xbbu8, 0xccu8, 0xddu8, 0xeeu8, 0xffu8];
- let c0 =
- [0x8eu8, 0xa2u8, 0xb7u8, 0xcau8, 0x51u8, 0x67u8, 0x45u8, 0xbfu8,
- 0xeau8, 0xfcu8, 0x49u8, 0x90u8, 0x4bu8, 0x49u8, 0x60u8, 0x89u8];
+ let k0 = [0x00u8, 0x01u8, 0x02u8, 0x03u8, 0x04u8, 0x05u8, 0x06u8, 0x07u8, 0x08u8, 0x09u8,
+ 0x0au8, 0x0bu8, 0x0cu8, 0x0du8, 0x0eu8, 0x0fu8, 0x10u8, 0x11u8, 0x12u8, 0x13u8,
+ 0x14u8, 0x15u8, 0x16u8, 0x17u8, 0x18u8, 0x19u8, 0x1au8, 0x1bu8, 0x1cu8, 0x1du8,
+ 0x1eu8, 0x1fu8];
+ let p0 = [0x00u8, 0x11u8, 0x22u8, 0x33u8, 0x44u8, 0x55u8, 0x66u8, 0x77u8, 0x88u8, 0x99u8,
+ 0xaau8, 0xbbu8, 0xccu8, 0xddu8, 0xeeu8, 0xffu8];
+ let c0 = [0x8eu8, 0xa2u8, 0xb7u8, 0xcau8, 0x51u8, 0x67u8, 0x45u8, 0xbfu8, 0xeau8, 0xfcu8,
+ 0x49u8, 0x90u8, 0x4bu8, 0x49u8, 0x60u8, 0x89u8];
let c = super::Crypter::new(super::Type::AES_256_ECB);
c.init(super::Mode::Encrypt, &k0, &[]);
c.pad(false);
@@ -202,22 +198,16 @@ mod tests {
#[test]
fn test_aes_256_cbc_decrypt() {
let cr = super::Crypter::new(super::Type::AES_256_CBC);
- let iv = [
- 4_u8, 223_u8, 153_u8, 219_u8, 28_u8, 142_u8, 234_u8, 68_u8, 227_u8,
- 69_u8, 98_u8, 107_u8, 208_u8, 14_u8, 236_u8, 60_u8, 0_u8, 0_u8,
- 0_u8, 0_u8, 0_u8, 0_u8, 0_u8, 0_u8, 0_u8, 0_u8, 0_u8, 0_u8, 0_u8,
- 0_u8, 0_u8, 0_u8
- ];
- let data = [
- 143_u8, 210_u8, 75_u8, 63_u8, 214_u8, 179_u8, 155_u8,
- 241_u8, 242_u8, 31_u8, 154_u8, 56_u8, 198_u8, 145_u8, 192_u8, 64_u8,
- 2_u8, 245_u8, 167_u8, 220_u8, 55_u8, 119_u8, 233_u8, 136_u8, 139_u8,
- 27_u8, 71_u8, 242_u8, 119_u8, 175_u8, 65_u8, 207_u8
- ];
- let ciphered_data = [
- 0x4a_u8, 0x2e_u8, 0xe5_u8, 0x6_u8, 0xbf_u8, 0xcf_u8, 0xf2_u8, 0xd7_u8,
- 0xea_u8, 0x2d_u8, 0xb1_u8, 0x85_u8, 0x6c_u8, 0x93_u8, 0x65_u8, 0x6f_u8
- ];
+ let iv = [4_u8, 223_u8, 153_u8, 219_u8, 28_u8, 142_u8, 234_u8, 68_u8, 227_u8, 69_u8,
+ 98_u8, 107_u8, 208_u8, 14_u8, 236_u8, 60_u8, 0_u8, 0_u8, 0_u8, 0_u8, 0_u8, 0_u8,
+ 0_u8, 0_u8, 0_u8, 0_u8, 0_u8, 0_u8, 0_u8, 0_u8, 0_u8, 0_u8];
+ let data = [143_u8, 210_u8, 75_u8, 63_u8, 214_u8, 179_u8, 155_u8, 241_u8, 242_u8, 31_u8,
+ 154_u8, 56_u8, 198_u8, 145_u8, 192_u8, 64_u8, 2_u8, 245_u8, 167_u8, 220_u8,
+ 55_u8, 119_u8, 233_u8, 136_u8, 139_u8, 27_u8, 71_u8, 242_u8, 119_u8, 175_u8,
+ 65_u8, 207_u8];
+ let ciphered_data = [0x4a_u8, 0x2e_u8, 0xe5_u8, 0x6_u8, 0xbf_u8, 0xcf_u8, 0xf2_u8,
+ 0xd7_u8, 0xea_u8, 0x2d_u8, 0xb1_u8, 0x85_u8, 0x6c_u8, 0x93_u8,
+ 0x65_u8, 0x6f_u8];
cr.init(super::Mode::Decrypt, &data, &iv);
cr.pad(false);
let unciphered_data_1 = cr.update(&ciphered_data);
@@ -234,7 +224,9 @@ mod tests {
use serialize::hex::ToHex;
let cipher = super::Crypter::new(ciphertype);
- cipher.init(super::Mode::Encrypt, &key.from_hex().unwrap(), &iv.from_hex().unwrap());
+ cipher.init(super::Mode::Encrypt,
+ &key.from_hex().unwrap(),
+ &iv.from_hex().unwrap());
let expected = ct.from_hex().unwrap();
let mut computed = cipher.update(&pt.from_hex().unwrap());
@@ -245,7 +237,8 @@ mod tests {
println!("Expected: {}", expected.to_hex());
if computed.len() != expected.len() {
println!("Lengths differ: {} in computed vs {} expected",
- computed.len(), expected.len());
+ computed.len(),
+ expected.len());
}
panic!("test failure");
}
@@ -267,9 +260,12 @@ mod tests {
fn test_aes256_xts() {
// Test case 174 from
// http://csrc.nist.gov/groups/STM/cavp/documents/aes/XTSTestVectors.zip
- let pt = "77f4ef63d734ebd028508da66c22cdebdd52ecd6ee2ab0a50bc8ad0cfd692ca5fcd4e6dedc45df7f6503f462611dc542";
- let ct = "ce7d905a7776ac72f240d22aafed5e4eb7566cdc7211220e970da634ce015f131a5ecb8d400bc9e84f0b81d8725dbbc7";
- let key = "b6bfef891f83b5ff073f2231267be51eb084b791fa19a154399c0684c8b2dfcb37de77d28bbda3b4180026ad640b74243b3133e7b9fae629403f6733423dae28";
+ let pt = "77f4ef63d734ebd028508da66c22cdebdd52ecd6ee2ab0a50bc8ad0cfd692ca5fcd4e6dedc45df7f\
+ 6503f462611dc542";
+ let ct = "ce7d905a7776ac72f240d22aafed5e4eb7566cdc7211220e970da634ce015f131a5ecb8d400bc9e8\
+ 4f0b81d8725dbbc7";
+ let key = "b6bfef891f83b5ff073f2231267be51eb084b791fa19a154399c0684c8b2dfcb37de77d28bbda3b\
+ 4180026ad640b74243b3133e7b9fae629403f6733423dae28";
let iv = "db200efb7eaaa737dbdf40babb68953f";
cipher_test(super::Type::AES_256_XTS, pt, ct, key, iv);
@@ -279,24 +275,26 @@ mod tests {
#[cfg(feature = "aes_ctr")]
fn test_aes128_ctr() {
- let pt = "6BC1BEE22E409F96E93D7E117393172AAE2D8A571E03AC9C9EB76FAC45AF8E5130C81C46A35CE411E5FBC1191A0A52EFF69F2445DF4F9B17AD2B417BE66C3710";
- let ct = "874D6191B620E3261BEF6864990DB6CE9806F66B7970FDFF8617187BB9FFFDFF5AE4DF3EDBD5D35E5B4F09020DB03EAB1E031DDA2FBE03D1792170A0F3009CEE";
+ let pt = "6BC1BEE22E409F96E93D7E117393172AAE2D8A571E03AC9C9EB76FAC45AF8E5130C81C46A35CE411\
+ E5FBC1191A0A52EFF69F2445DF4F9B17AD2B417BE66C3710";
+ let ct = "874D6191B620E3261BEF6864990DB6CE9806F66B7970FDFF8617187BB9FFFDFF5AE4DF3EDBD5D35E\
+ 5B4F09020DB03EAB1E031DDA2FBE03D1792170A0F3009CEE";
let key = "2B7E151628AED2A6ABF7158809CF4F3C";
let iv = "F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF";
cipher_test(super::Type::AES_128_CTR, pt, ct, key, iv);
}
- /*#[test]
- fn test_aes128_gcm() {
- // Test case 3 in GCM spec
- let pt = ~"d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255";
- let ct = ~"42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f59854d5c2af327cd64a62cf35abd2ba6fab4";
- let key = ~"feffe9928665731c6d6a8f9467308308";
- let iv = ~"cafebabefacedbaddecaf888";
-
- cipher_test(super::AES_128_GCM, pt, ct, key, iv);
- }*/
+ // #[test]
+ // fn test_aes128_gcm() {
+ // Test case 3 in GCM spec
+ // let pt = ~"d9313225f88406e5a55909c5aff5269a86a7a9531534f7da2e4c303d8a318a721c3c0c95956809532fcf0e2449a6b525b16aedf5aa0de657ba637b391aafd255";
+ // let ct = ~"42831ec2217774244b7221b784d0d49ce3aa212f2c02a4e035c17e2329aca12e21d514b25466931c7d8f6a5aac84aa051ba30b396a0aac973d58e091473f59854d5c2af327cd64a62cf35abd2ba6fab4";
+ // let key = ~"feffe9928665731c6d6a8f9467308308";
+ // let iv = ~"cafebabefacedbaddecaf888";
+ //
+ // cipher_test(super::AES_128_GCM, pt, ct, key, iv);
+ // }
#[test]
fn test_aes128_cfb1() {
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-12 15:42:43 +0000