min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ossl110g feature gate

This commit is contained in:
Ivan Nikulin 2020-11-11 13:11:45 +00:00
parent 96d14f9e4b
commit 0da810d4d5
5 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openssl-sys/build.rs
View File

@ -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);

1
openssl/build.rs
View File

@ -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);

2
openssl/src/ssl/mod.rs
View File

@ -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());

2
openssl/src/ssl/test/mod.rs
View File

@ -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();

1
systest/build.rs
View File

@ -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);