diff options
author | Charlie Li <git@vishwin.info> | 2020-12-05 23:23:29 -0500 |
---|---|---|
committer | Charlie Li <git@vishwin.info> | 2020-12-05 23:23:29 -0500 |
commit | 92de3741e05caeae26384d76bd16cdad8fefbdf5 (patch) | |
tree | 9ad8a5bc0bb4f598abbcdad559c07663aa19a445 | |
parent | 24f20ce2e61bf3353dd04ec54909f98eaa067766 (diff) | |
download | rust-openssl-92de3741e05caeae26384d76bd16cdad8fefbdf5.zip |
LibreSSL 3.2.1+: revert forced TLSv1.2 and ignore failing tests until TLSv1.3 API becomes available
-rw-r--r-- | openssl-sys/src/ssl.rs | 9 | ||||
-rw-r--r-- | openssl/src/ssl/mod.rs | 8 | ||||
-rw-r--r-- | openssl/src/ssl/test/mod.rs | 6 |
3 files changed, 7 insertions, 16 deletions
diff --git a/openssl-sys/src/ssl.rs b/openssl-sys/src/ssl.rs index ff33f1af..bf7539fe 100644 --- a/openssl-sys/src/ssl.rs +++ b/openssl-sys/src/ssl.rs @@ -1101,20 +1101,11 @@ cfg_if! { extern "C" { pub fn TLS_method() -> *const SSL_METHOD; - #[cfg(libressl321)] - pub fn TLSv1_2_method() -> *const SSL_METHOD; - pub fn DTLS_method() -> *const SSL_METHOD; pub fn TLS_server_method() -> *const SSL_METHOD; - #[cfg(libressl321)] - pub fn TLSv1_2_server_method() -> *const SSL_METHOD; - pub fn TLS_client_method() -> *const SSL_METHOD; - - #[cfg(libressl321)] - pub fn TLSv1_2_client_method() -> *const SSL_METHOD; } } else { extern "C" { diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index 9a05ea3f..fc507c50 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -3972,13 +3972,7 @@ cfg_if! { } cfg_if! { - // LibreSSL 3.2.1 and later's TLSv1.3 support is incomplete - if #[cfg(libressl321)] { - use ffi::{ - TLSv1_2_method as TLS_method, DTLS_method, TLSv1_2_client_method as TLS_client_method, - TLSv1_2_server_method as TLS_server_method, - }; - } else if #[cfg(any(ossl110, libressl291))] { + if #[cfg(any(ossl110, libressl291))] { use ffi::{TLS_method, DTLS_method, TLS_client_method, TLS_server_method}; } else { use ffi::{ diff --git a/openssl/src/ssl/test/mod.rs b/openssl/src/ssl/test/mod.rs index 8233e6f7..37a23800 100644 --- a/openssl/src/ssl/test/mod.rs +++ b/openssl/src/ssl/test/mod.rs @@ -554,6 +554,7 @@ fn read_panic() { } #[test] +#[cfg_attr(libressl321, ignore)] #[should_panic(expected = "blammo")] fn flush_panic() { struct ExplodingStream(TcpStream); @@ -841,6 +842,7 @@ fn cert_store() { } #[test] +#[cfg_attr(libressl321, ignore)] fn tmp_dh_callback() { static CALLED_BACK: AtomicBool = AtomicBool::new(false); @@ -887,6 +889,7 @@ fn tmp_ecdh_callback() { } #[test] +#[cfg_attr(libressl321, ignore)] fn tmp_dh_callback_ssl() { static CALLED_BACK: AtomicBool = AtomicBool::new(false); @@ -944,6 +947,7 @@ fn idle_session() { } #[test] +#[cfg_attr(libressl321, ignore)] fn active_session() { let server = Server::builder().build(); @@ -999,6 +1003,7 @@ fn status_callbacks() { } #[test] +#[cfg_attr(libressl321, ignore)] fn new_session_callback() { static CALLED_BACK: AtomicBool = AtomicBool::new(false); @@ -1022,6 +1027,7 @@ fn new_session_callback() { } #[test] +#[cfg_attr(libressl321, ignore)] fn new_session_callback_swapped_ctx() { static CALLED_BACK: AtomicBool = AtomicBool::new(false); |