Skip to content

Commit 2c14392

Browse files
authored
Merge pull request sfackler#2447 from alebastr/bssl-decrepit
Disable AES-CFB128 ciphers for BoringSSL
2 parents 9119367 + 79fdfd0 commit 2c14392

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

openssl/src/cipher.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ impl Cipher {
238238
unsafe { CipherRef::from_ptr(ffi::EVP_aes_192_cfb1() as *mut _) }
239239
}
240240

241+
#[cfg(not(boringssl))]
241242
pub fn aes_192_cfb128() -> &'static CipherRef {
242243
unsafe { CipherRef::from_ptr(ffi::EVP_aes_192_cfb128() as *mut _) }
243244
}
@@ -295,6 +296,7 @@ impl Cipher {
295296
unsafe { CipherRef::from_ptr(ffi::EVP_aes_256_cfb1() as *mut _) }
296297
}
297298

299+
#[cfg(not(boringssl))]
298300
pub fn aes_256_cfb128() -> &'static CipherRef {
299301
unsafe { CipherRef::from_ptr(ffi::EVP_aes_256_cfb128() as *mut _) }
300302
}

openssl/src/symm.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ impl Cipher {
114114
unsafe { Cipher(ffi::EVP_aes_128_cfb1()) }
115115
}
116116

117+
#[cfg(not(boringssl))]
117118
pub fn aes_128_cfb128() -> Cipher {
118119
unsafe { Cipher(ffi::EVP_aes_128_cfb128()) }
119120
}
@@ -159,6 +160,7 @@ impl Cipher {
159160
unsafe { Cipher(ffi::EVP_aes_192_cfb1()) }
160161
}
161162

163+
#[cfg(not(boringssl))]
162164
pub fn aes_192_cfb128() -> Cipher {
163165
unsafe { Cipher(ffi::EVP_aes_192_cfb128()) }
164166
}
@@ -209,6 +211,7 @@ impl Cipher {
209211
unsafe { Cipher(ffi::EVP_aes_256_cfb1()) }
210212
}
211213

214+
#[cfg(not(boringssl))]
212215
pub fn aes_256_cfb128() -> Cipher {
213216
unsafe { Cipher(ffi::EVP_aes_256_cfb128()) }
214217
}

0 commit comments

Comments
 (0)