From 0da810d4d5334abd31ca2c7b2f0b953963bf1ff1 Mon Sep 17 00:00:00 2001
From: Ivan Nikulin <inikulin@cloudflare.com>
Date: Wed, 11 Nov 2020 13:11:45 +0000
Subject: [PATCH] Remove ossl110g feature gate

---
 openssl-sys/build.rs        | 1 -
 openssl/build.rs            | 1 -
 openssl/src/ssl/mod.rs      | 2 --
 openssl/src/ssl/test/mod.rs | 2 --
 systest/build.rs            | 1 -
 5 files changed, 7 deletions(-)

diff --git a/openssl-sys/build.rs b/openssl-sys/build.rs
index adae852a..a65b1623 100644
--- a/openssl-sys/build.rs
+++ b/openssl-sys/build.rs
@@ -193,7 +193,6 @@ fn main() {
     cfgs.push("ossl102h");
     cfgs.push("ossl110");
     cfgs.push("ossl110f");
-    cfgs.push("ossl110g");
 
     for cfg in cfgs {
         println!("cargo:rustc-cfg={}", cfg);
diff --git a/openssl/build.rs b/openssl/build.rs
index 4efd86e0..5b9d299e 100644
--- a/openssl/build.rs
+++ b/openssl/build.rs
@@ -7,7 +7,6 @@ fn main() {
     cfgs.push("ossl102h");
     cfgs.push("ossl110");
     cfgs.push("ossl110f");
-    cfgs.push("ossl110g");
 
     for cfg in cfgs {
         println!("cargo:rustc-cfg={}", cfg);
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 59032a0c..92c21258 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -1054,7 +1054,6 @@ impl SslContextBuilder {
     /// Requires OpenSSL 1.1.0g or LibreSSL 2.7.0 or newer.
     ///
     /// [`SSL_CTX_get_min_proto_version`]: https://www.openssl.org/docs/man1.1.0/ssl/SSL_set_min_proto_version.html
-    #[cfg(any(ossl110g, libressl270))]
     pub fn min_proto_version(&mut self) -> Option<SslVersion> {
         unsafe {
             let r = ffi::SSL_CTX_get_min_proto_version(self.as_ptr());
@@ -1076,7 +1075,6 @@ impl SslContextBuilder {
     /// Requires OpenSSL 1.1.0g or LibreSSL 2.7.0 or newer.
     ///
     /// [`SSL_CTX_get_max_proto_version`]: https://www.openssl.org/docs/man1.1.0/ssl/SSL_set_min_proto_version.html
-    #[cfg(any(ossl110g, libressl270))]
     pub fn max_proto_version(&mut self) -> Option<SslVersion> {
         unsafe {
             let r = ffi::SSL_CTX_get_max_proto_version(self.as_ptr());
diff --git a/openssl/src/ssl/test/mod.rs b/openssl/src/ssl/test/mod.rs
index ba550d3a..00364c3f 100644
--- a/openssl/src/ssl/test/mod.rs
+++ b/openssl/src/ssl/test/mod.rs
@@ -1010,7 +1010,6 @@ fn no_version_overlap() {
         .ctx()
         .set_max_proto_version(Some(SslVersion::TLS1_1))
         .unwrap();
-    #[cfg(any(ossl110g, libressl270))]
     assert_eq!(server.ctx().max_proto_version(), Some(SslVersion::TLS1_1));
     server.should_error();
     let server = server.build();
@@ -1020,7 +1019,6 @@ fn no_version_overlap() {
         .ctx()
         .set_min_proto_version(Some(SslVersion::TLS1_2))
         .unwrap();
-    #[cfg(ossl110g)]
     assert_eq!(client.ctx().min_proto_version(), Some(SslVersion::TLS1_2));
     client.ctx().set_max_proto_version(None).unwrap();
 
diff --git a/systest/build.rs b/systest/build.rs
index 7b3eb726..b2007402 100644
--- a/systest/build.rs
+++ b/systest/build.rs
@@ -31,7 +31,6 @@ fn main() {
     cfgs.push("ossl102h");
     cfgs.push("ossl110");
     cfgs.push("ossl110f");
-    cfgs.push("ossl110g");
 
     for c in cfgs {
         cfg.cfg(c, None);