Merge branch 'release-v0.7.15-sys-v0.8.0' into releaseopenssl-v0.8.0openssl-sys-v0.7.15

1 files changed, 0 insertions, 35 deletions

diff --git a/openssl/src/crypto/symm_internal.rs b/openssl/src/crypto/symm_internal.rs
deleted file mode 100644
index ba01e1c1..00000000
--- a/openssl/src/crypto/symm_internal.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use crypto::symm;
-use ffi;
-
-pub fn evpc(t: symm::Type) -> (*const ffi::EVP_CIPHER, u32, u32) {
-    unsafe {
-        match t {
-            symm::Type::AES_128_ECB => (ffi::EVP_aes_128_ecb(), 16, 16),
-            symm::Type::AES_128_CBC => (ffi::EVP_aes_128_cbc(), 16, 16),
-            #[cfg(feature = "aes_xts")]
-            symm::Type::AES_128_XTS => (ffi::EVP_aes_128_xts(), 32, 16),
-            #[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),
-            #[cfg(feature = "aes_xts")]
-            symm::Type::AES_256_XTS => (ffi::EVP_aes_256_xts(), 64, 16),
-            #[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::DES_CBC => (ffi::EVP_des_cbc(), 8, 8),
-            symm::Type::DES_ECB => (ffi::EVP_des_ecb(), 8, 8),
-
-            symm::Type::RC4_128 => (ffi::EVP_rc4(), 16, 0),
-        }
-    }
-}