aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/dh
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-10-13 19:46:13 -0700
committerSteven Fackler <[email protected]>2016-10-13 19:46:13 -0700
commitedfc50f37db8d230eb17480f124b9fd70166a940 (patch)
tree1849ef2aaa0fece3a93b4bf797773ef5ee2ddfdc /openssl/src/dh
parentCorrect feature selection in tests (diff)
downloadrust-openssl-edfc50f37db8d230eb17480f124b9fd70166a940.tar.xz
rust-openssl-edfc50f37db8d230eb17480f124b9fd70166a940.zip
Clean up features
Diffstat (limited to 'openssl/src/dh')
-rw-r--r--openssl/src/dh/mod.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/openssl/src/dh/mod.rs b/openssl/src/dh/mod.rs
index 4ee2d890..b716ffe0 100644
--- a/openssl/src/dh/mod.rs
+++ b/openssl/src/dh/mod.rs
@@ -30,19 +30,19 @@ impl DH {
Ok(DH(dh))
}
- #[cfg(all(feature = "rfc5114", not(ossl101)))]
+ #[cfg(feature = "openssl-102")]
pub fn get_1024_160() -> Result<DH, ErrorStack> {
let dh = try_ssl_null!(unsafe { ffi::DH_get_1024_160() });
Ok(DH(dh))
}
- #[cfg(all(feature = "rfc5114", not(ossl101)))]
+ #[cfg(feature = "openssl-102")]
pub fn get_2048_224() -> Result<DH, ErrorStack> {
let dh = try_ssl_null!(unsafe { ffi::DH_get_2048_224() });
Ok(DH(dh))
}
- #[cfg(all(feature = "rfc5114", not(ossl101)))]
+ #[cfg(feature = "openssl-102")]
pub fn get_2048_256() -> Result<DH, ErrorStack> {
let dh = try_ssl_null!(unsafe { ffi::DH_get_2048_256() });
Ok(DH(dh))
@@ -92,7 +92,7 @@ mod tests {
use ssl::SslMethod::Tls;
#[test]
- #[cfg(all(feature = "rfc5114", not(ossl101)))]
+ #[cfg(feature = "openssl-102")]
fn test_dh_rfc5114() {
let mut ctx = SslContext::new(Tls).unwrap();
let dh1 = DH::get_1024_160().unwrap();