diff --git a/openssl-sys/build.rs b/openssl-sys/build.rs index a65b1623..ffd347d7 100644 --- a/openssl-sys/build.rs +++ b/openssl-sys/build.rs @@ -192,7 +192,6 @@ fn main() { cfgs.push("ossl102f"); cfgs.push("ossl102h"); cfgs.push("ossl110"); - cfgs.push("ossl110f"); for cfg in cfgs { println!("cargo:rustc-cfg={}", cfg); diff --git a/openssl-sys/src/ssl.rs b/openssl-sys/src/ssl.rs index 15ec20f6..93aff131 100644 --- a/openssl-sys/src/ssl.rs +++ b/openssl-sys/src/ssl.rs @@ -148,15 +148,7 @@ pub const SSL_OP_NO_TLSv1_3: c_uint = 0x20000000; #[cfg(ossl110h)] pub const SSL_OP_NO_RENEGOTIATION: c_uint = 0x40000000; -cfg_if! { - if #[cfg(ossl110f)] { - pub const SSL_OP_ALL: c_uint = - SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS - | SSL_OP_LEGACY_SERVER_CONNECT; - } else { - pub const SSL_OP_ALL: c_uint = 0x80000BFF; - } -} +pub const SSL_OP_ALL: c_uint = SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS | SSL_OP_LEGACY_SERVER_CONNECT; cfg_if! { if #[cfg(ossl110)] { @@ -352,7 +344,10 @@ extern "C" { } extern "C" { - pub fn SSL_CTX_set_keylog_callback(ctx: *mut SSL_CTX, cb: Option); + pub fn SSL_CTX_set_keylog_callback( + ctx: *mut SSL_CTX, + cb: Option, + ); pub fn SSL_get_finished(s: *const SSL, buf: *mut c_void, count: size_t) -> size_t; pub fn SSL_get_peer_finished(s: *const SSL, buf: *mut c_void, count: size_t) -> size_t; @@ -720,16 +715,8 @@ extern "C" { pub fn SSL_session_reused(ssl: *const SSL) -> c_int; } -cfg_if! { - if #[cfg(any(ossl110f, libressl273))] { - extern "C" { - pub fn SSL_is_server(s: *const SSL) -> c_int; - } - } else if #[cfg(ossl102)] { - extern "C" { - pub fn SSL_is_server(s: *mut SSL) -> c_int; - } - } +extern "C" { + pub fn SSL_is_server(s: *const SSL) -> c_int; } #[cfg(ossl110)] diff --git a/openssl/build.rs b/openssl/build.rs index 5b9d299e..208ede90 100644 --- a/openssl/build.rs +++ b/openssl/build.rs @@ -6,7 +6,6 @@ fn main() { cfgs.push("ossl102f"); cfgs.push("ossl102h"); cfgs.push("ossl110"); - cfgs.push("ossl110f"); for cfg in cfgs { println!("cargo:rustc-cfg={}", cfg); diff --git a/openssl/src/aes.rs b/openssl/src/aes.rs index 58e66a9e..89929e1e 100644 --- a/openssl/src/aes.rs +++ b/openssl/src/aes.rs @@ -19,7 +19,7 @@ //! [`Cipher`]: ../symm/struct.Cipher.html //! //! # Examples -//! +//! //! ## Key wrapping //! ```rust //! use openssl::aes::{AesKey, unwrap_key, wrap_key}; diff --git a/openssl/src/ecdsa.rs b/openssl/src/ecdsa.rs index 35ded288..4a534860 100644 --- a/openssl/src/ecdsa.rs +++ b/openssl/src/ecdsa.rs @@ -170,4 +170,4 @@ cfg_if! { } } } -} \ No newline at end of file +} diff --git a/openssl/src/ssl/callbacks.rs b/openssl/src/ssl/callbacks.rs index ff0a8ebd..07e42602 100644 --- a/openssl/src/ssl/callbacks.rs +++ b/openssl/src/ssl/callbacks.rs @@ -367,4 +367,4 @@ where let line = str::from_utf8_unchecked(line); callback(ssl, line); -} \ No newline at end of file +} diff --git a/openssl/src/x509/tests.rs b/openssl/src/x509/tests.rs index dbd3920b..0541e9f4 100644 --- a/openssl/src/x509/tests.rs +++ b/openssl/src/x509/tests.rs @@ -36,7 +36,7 @@ fn test_debug() { let cert = include_bytes!("../../test/cert.pem"); let cert = X509::from_pem(cert).unwrap(); let debugged = format!("{:#?}", cert); - + assert!(debugged.contains(r#"serial_number: "8771f7bdee982fa5""#)); assert!(debugged.contains(r#"signature_algorithm: sha256WithRSAEncryption"#)); assert!(debugged.contains(r#"countryName = "AU""#)); diff --git a/systest/build.rs b/systest/build.rs index b2007402..9e601320 100644 --- a/systest/build.rs +++ b/systest/build.rs @@ -30,7 +30,6 @@ fn main() { cfgs.push("ossl102f"); cfgs.push("ossl102h"); cfgs.push("ossl110"); - cfgs.push("ossl110f"); for c in cfgs { cfg.cfg(c, None);