diff options
Diffstat (limited to 'openssl-sys')
| -rw-r--r-- | openssl-sys/build.rs | 11 | ||||
| -rw-r--r-- | openssl-sys/src/lib.rs | 8 | ||||
| -rw-r--r-- | openssl-sys/src/libressl/mod.rs | 8 |
3 files changed, 18 insertions, 9 deletions
diff --git a/openssl-sys/build.rs b/openssl-sys/build.rs index 34b74f82..b0163834 100644 --- a/openssl-sys/build.rs +++ b/openssl-sys/build.rs @@ -316,8 +316,10 @@ fn validate_headers(include_dirs: &[PathBuf]) -> Version { #include <openssl/opensslv.h> #include <openssl/opensslconf.h> -#if LIBRESSL_VERSION_NUMBER >= 0x20603000 +#if LIBRESSL_VERSION_NUMBER >= 0x20604000 RUST_LIBRESSL_NEW +#elif LIBRESSL_VERSION_NUMBER >= 0x20603000 +RUST_LIBRESSL_263 #elif LIBRESSL_VERSION_NUMBER >= 0x20602000 RUST_LIBRESSL_262 #elif LIBRESSL_VERSION_NUMBER >= 0x20601000 @@ -475,6 +477,13 @@ See rust-openssl README for more information: println!("cargo:libressl_version=262"); println!("cargo:version=101"); Version::Libressl + } else if expanded.contains("RUST_LIBRESSL_263") { + println!("cargo:rustc-cfg=libressl"); + println!("cargo:rustc-cfg=libressl263"); + println!("cargo:libressl=true"); + println!("cargo:libressl_version=263"); + println!("cargo:version=101"); + Version::Libressl } else if expanded.contains("RUST_OPENSSL_110F") { println!("cargo:rustc-cfg=ossl110"); println!("cargo:rustc-cfg=ossl110f"); diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 5c8bef7f..0bc7075f 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -1250,14 +1250,14 @@ pub const SSL_VERIFY_NONE: c_int = 0; pub const SSL_VERIFY_PEER: c_int = 1; pub const SSL_VERIFY_FAIL_IF_NO_PEER_CERT: c_int = 2; -#[cfg(not(any(libressl261, libressl262, ossl101)))] +#[cfg(not(any(libressl261, libressl262, libressl263, ossl101)))] pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x00000010; -#[cfg(any(libressl261, libressl262))] +#[cfg(any(libressl261, libressl262, libressl263))] pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x0; pub const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: c_ulong = 0x00000800; -#[cfg(not(any(libressl261, libressl262)))] +#[cfg(not(any(libressl261, libressl262, libressl263)))] pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x80000000; -#[cfg(any(libressl261, libressl262))] +#[cfg(any(libressl261, libressl262, libressl263))] pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x0; pub const SSL_OP_LEGACY_SERVER_CONNECT: c_ulong = 0x00000004; #[cfg(not(libressl))] diff --git a/openssl-sys/src/libressl/mod.rs b/openssl-sys/src/libressl/mod.rs index 52a76f9e..40092256 100644 --- a/openssl-sys/src/libressl/mod.rs +++ b/openssl-sys/src/libressl/mod.rs @@ -345,9 +345,9 @@ pub const SSL_CTRL_OPTIONS: c_int = 32; pub const SSL_CTRL_CLEAR_OPTIONS: c_int = 77; pub const SSL_CTRL_SET_ECDH_AUTO: c_int = 94; -#[cfg(any(libressl261, libressl262))] +#[cfg(any(libressl261, libressl262, libressl263))] pub const SSL_OP_ALL: c_ulong = 0x4; -#[cfg(not(any(libressl261, libressl262)))] +#[cfg(not(any(libressl261, libressl262, libressl263)))] pub const SSL_OP_ALL: c_ulong = 0x80000014; pub const SSL_OP_CISCO_ANYCONNECT: c_ulong = 0x0; pub const SSL_OP_NO_COMPRESSION: c_ulong = 0x0; @@ -360,9 +360,9 @@ pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = 0x0; pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x0; pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x0; pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x0; -#[cfg(any(libressl261, libressl262))] +#[cfg(any(libressl261, libressl262, libressl263))] pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x0; -#[cfg(not(any(libressl261, libressl262)))] +#[cfg(not(any(libressl261, libressl262, libressl263)))] pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00080000; pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00100000; pub const SSL_OP_NO_SSLv2: c_ulong = 0x0; |