aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/crypto/symm_internal.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-10-14 22:25:48 -0400
committerSteven Fackler <[email protected]>2015-10-14 22:25:48 -0400
commit38b0defd91fb8965afda164c09afa72d07359eb0 (patch)
tree16283f2a026afd2caf723c94636c12a2eff7f80f /openssl/src/crypto/symm_internal.rs
parentMerge branch 'release-v0.6.6' into release (diff)
parentRelease v0.6.7 (diff)
downloadrust-openssl-0.6.7.tar.xz
rust-openssl-0.6.7.zip
Merge branch 'release-v0.6.7' into releasev0.6.7
Diffstat (limited to 'openssl/src/crypto/symm_internal.rs')
-rw-r--r--openssl/src/crypto/symm_internal.rs8
1 files changed, 7 insertions, 1 deletions
diff --git a/openssl/src/crypto/symm_internal.rs b/openssl/src/crypto/symm_internal.rs
index c42efb79..fcb3ee71 100644
--- a/openssl/src/crypto/symm_internal.rs
+++ b/openssl/src/crypto/symm_internal.rs
@@ -11,6 +11,9 @@ pub fn evpc(t: symm::Type) -> (*const ffi::EVP_CIPHER, u32, u32) {
#[cfg(feature = "aes_ctr")]
symm::Type::AES_128_CTR => (ffi::EVP_aes_128_ctr(), 16, 0),
//AES_128_GCM => (EVP_aes_128_gcm(), 16, 16),
+ symm::Type::AES_128_CFB1 => (ffi::EVP_aes_128_cfb1(), 16, 16),
+ symm::Type::AES_128_CFB128 => (ffi::EVP_aes_128_cfb128(), 16, 16),
+ symm::Type::AES_128_CFB8 => (ffi::EVP_aes_128_cfb8(), 16, 16),
symm::Type::AES_256_ECB => (ffi::EVP_aes_256_ecb(), 32, 16),
symm::Type::AES_256_CBC => (ffi::EVP_aes_256_cbc(), 32, 16),
@@ -19,8 +22,11 @@ pub fn evpc(t: symm::Type) -> (*const ffi::EVP_CIPHER, u32, u32) {
#[cfg(feature = "aes_ctr")]
symm::Type::AES_256_CTR => (ffi::EVP_aes_256_ctr(), 32, 0),
//AES_256_GCM => (EVP_aes_256_gcm(), 32, 16),
+ symm::Type::AES_256_CFB1 => (ffi::EVP_aes_256_cfb1(), 32, 16),
+ symm::Type::AES_256_CFB128 => (ffi::EVP_aes_256_cfb128(), 32, 16),
+ symm::Type::AES_256_CFB8 => (ffi::EVP_aes_256_cfb8(), 32, 16),
symm::Type::RC4_128 => (ffi::EVP_rc4(), 16, 0),
}
}
-} \ No newline at end of file
+}