Merge pull request #2497 from rust-openssl/botovq-simplify-cfg

Author: botovq

openssl/src/dh.rs

@@ -155,7 +155,7 @@ impl Dh<Params> {
 
     /// Requires OpenSSL 1.0.2 or newer.
     #[corresponds(DH_get_1024_160)]
-    #[cfg(any(ossl102, ossl110))]
+    #[cfg(ossl102)]
     pub fn get_1024_160() -> Result<Dh<Params>, ErrorStack> {
         unsafe {
             ffi::init();
@@ -165,7 +165,7 @@ impl Dh<Params> {
 
     /// Requires OpenSSL 1.0.2 or newer.
     #[corresponds(DH_get_2048_224)]
-    #[cfg(any(ossl102, ossl110))]
+    #[cfg(ossl102)]
     pub fn get_2048_224() -> Result<Dh<Params>, ErrorStack> {
         unsafe {
             ffi::init();
@@ -175,7 +175,7 @@ impl Dh<Params> {
 
     /// Requires OpenSSL 1.0.2 or newer.
     #[corresponds(DH_get_2048_256)]
-    #[cfg(any(ossl102, ossl110))]
+    #[cfg(ossl102)]
     pub fn get_2048_256() -> Result<Dh<Params>, ErrorStack> {
         unsafe {
             ffi::init();

openssl/src/ssl/mod.rs

@@ -246,7 +246,7 @@ bitflags! {
         ///
         /// let options = SslOptions::NO_SSL_MASK & !SslOptions::NO_TLSV1_2;
         /// ```
-        #[cfg(any(ossl102, ossl110))]
+        #[cfg(ossl102)]
         const NO_SSL_MASK = ffi::SSL_OP_NO_SSL_MASK as SslOptionsRepr;
 
         /// Disallow all renegotiation in TLSv1.2 and earlier.