Skip to content

Commit 9784356

Browse files
committed
chore: simplify cfg attributes
1 parent 8ab3c3f commit 9784356

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

openssl/src/ssl/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ impl AlpnError {
599599
/// Terminate the handshake with a fatal alert.
600600
///
601601
/// Requires OpenSSL 1.1.0 or newer.
602-
#[cfg(any(ossl110))]
602+
#[cfg(ossl110)]
603603
pub const ALERT_FATAL: AlpnError = AlpnError(ffi::SSL_TLSEXT_ERR_ALERT_FATAL);
604604

605605
/// Do not select a protocol, but continue the handshake.
@@ -2413,7 +2413,7 @@ impl SslRef {
24132413
///
24142414
/// Requires OpenSSL 1.0.1 or 1.0.2.
24152415
#[corresponds(SSL_set_tmp_ecdh_callback)]
2416-
#[cfg(any(all(ossl101, not(ossl110))))]
2416+
#[cfg(all(ossl101, not(ossl110)))]
24172417
#[deprecated(note = "this function leaks memory and does not exist on newer OpenSSL versions")]
24182418
pub fn set_tmp_ecdh_callback<F>(&mut self, callback: F)
24192419
where

openssl/src/ssl/test/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ fn test_alpn_server_advertise_multiple() {
467467
}
468468

469469
#[test]
470-
#[cfg(any(ossl110))]
470+
#[cfg(ossl110)]
471471
fn test_alpn_server_select_none_fatal() {
472472
let mut server = Server::builder();
473473
server.ctx().set_alpn_select_callback(|_, client| {

openssl/src/symm.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ mod tests {
14781478
}
14791479

14801480
#[test]
1481-
#[cfg(any(ossl110))]
1481+
#[cfg(ossl110)]
14821482
fn test_chacha20() {
14831483
let key = "0000000000000000000000000000000000000000000000000000000000000000";
14841484
let iv = "00000000000000000000000000000000";
@@ -1493,7 +1493,7 @@ mod tests {
14931493
}
14941494

14951495
#[test]
1496-
#[cfg(any(ossl110))]
1496+
#[cfg(ossl110)]
14971497
fn test_chacha20_poly1305() {
14981498
let key = "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f";
14991499
let iv = "070000004041424344454647";

0 commit comments

Comments
 (0)