diff options
| author | Tatsuyuki Ishi <[email protected]> | 2018-09-25 16:17:12 +0900 |
|---|---|---|
| committer | Tatsuyuki Ishi <[email protected]> | 2018-09-25 22:00:20 +0900 |
| commit | 3b73dda4b31c2b8ea8417fb6d68e451d2e4b3633 (patch) | |
| tree | 82bdb5ed14597ed275a4a7459e170872edde34b5 /openssl/src/dh.rs | |
| parent | Raise requirement to 1.21.0 (diff) | |
| download | rust-openssl-0.9.x.tar.xz rust-openssl-0.9.x.zip | |
Add support for OpenSSL 1.1.10.9.x
Diffstat (limited to 'openssl/src/dh.rs')
| -rw-r--r-- | openssl/src/dh.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openssl/src/dh.rs b/openssl/src/dh.rs index 50d9da7b..e667eba3 100644 --- a/openssl/src/dh.rs +++ b/openssl/src/dh.rs @@ -40,7 +40,7 @@ impl Dh { from_der!(Dh, ffi::d2i_DHparams); /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0. - #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] + #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl11x)))] pub fn get_1024_160() -> Result<Dh, ErrorStack> { unsafe { ffi::init(); @@ -49,7 +49,7 @@ impl Dh { } /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0. - #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] + #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl11x)))] pub fn get_2048_224() -> Result<Dh, ErrorStack> { unsafe { ffi::init(); @@ -58,7 +58,7 @@ impl Dh { } /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0. - #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] + #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl11x)))] pub fn get_2048_256() -> Result<Dh, ErrorStack> { unsafe { ffi::init(); @@ -67,7 +67,7 @@ impl Dh { } } -#[cfg(ossl110)] +#[cfg(ossl11x)] mod compat { pub use ffi::DH_set0_pqg; } @@ -98,7 +98,7 @@ mod tests { use ssl::{SslMethod, SslContext}; #[test] - #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] + #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl11x)))] fn test_dh_rfc5114() { let mut ctx = SslContext::builder(SslMethod::tls()).unwrap(); let dh1 = Dh::get_1024_160().unwrap(); |