File 1671-Remove-and-or-in-ssl.patch of Package erlang

From b7096a6bb319a5cb6d44d954b9b5f0b3bfbda475 Mon Sep 17 00:00:00 2001
From: Maria Scott <maria-12648430@hnc-agency.org>
Date: Tue, 20 Jan 2026 09:02:36 +0100
Subject: [PATCH] Remove and/or in ssl

---
 lib/ssl/src/ssl_cipher.erl     | 10 ++++------
 lib/ssl/src/ssl_gen_statem.erl |  6 ++----
 lib/ssl/src/ssl_handshake.erl  |  8 +++-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index 8744eb5714..edb7f37944 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -893,8 +891,8 @@ hash_algorithm(?SHA224) -> sha224;
 hash_algorithm(?SHA256) -> sha256;
 hash_algorithm(?SHA384) -> sha384;
 hash_algorithm(?SHA512) -> sha512;
-hash_algorithm(Other)  when is_integer(Other) andalso ((Other >= 7) and (Other =< 223)) -> unassigned;
-hash_algorithm(Other)  when is_integer(Other) andalso ((Other >= 224) and (Other =< 255)) -> Other.
+hash_algorithm(Other)  when is_integer(Other), Other >= 7, Other =< 223 -> unassigned;
+hash_algorithm(Other)  when is_integer(Other), Other >= 224, Other =< 255 -> Other.
 
 sign_algorithm(anon)  -> ?ANON;
 sign_algorithm(rsa)   -> ?RSA;
@@ -904,8 +902,8 @@ sign_algorithm(?ANON) -> anon;
 sign_algorithm(?RSA) -> rsa;
 sign_algorithm(?DSA) -> dsa;
 sign_algorithm(?ECDSA) -> ecdsa;
-sign_algorithm(Other) when is_integer(Other) andalso ((Other >= 4) and (Other =< 223)) -> unassigned;
-sign_algorithm(Other) when is_integer(Other) andalso ((Other >= 224) and (Other =< 255)) -> Other.
+sign_algorithm(Other) when is_integer(Other), Other >= 4, Other =< 223 -> unassigned;
+sign_algorithm(Other) when is_integer(Other), Other >= 224, Other =< 255 -> Other.
 
 
 signature_algorithm_to_scheme(#'SignatureAlgorithm'{algorithm = ?'id-RSASSA-PSS',
diff --git a/lib/ssl/src/ssl_gen_statem.erl b/lib/ssl/src/ssl_gen_statem.erl
index 57fe7579ce..bfafe4e3f9 100644
--- a/lib/ssl/src/ssl_gen_statem.erl
+++ b/lib/ssl/src/ssl_gen_statem.erl
@@ -1768,8 +1766,8 @@ deliver_app_data(UserSocket, #socket_options{active=Active, packet=Type} = SOpts
     SO =
         case Data of
             {P, _, _, _}
-              when ((P =:= http_request) or (P =:= http_response)),
-                   ((Type =:= http) or (Type =:= http_bin)) ->
+              when P =:= http_request orelse P =:= http_response,
+                   Type =:= http orelse Type =:= http_bin ->
                 SOpts#socket_options{packet={Type, headers}};
             http_eoh when tuple_size(Type) =:= 2 ->
                 %% End of headers - expect another Request/Response line
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 4bd24db2fc..7f0631924f 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -2102,8 +2100,8 @@ validation_fun_and_state(undefined, VerifyState, CertPath, LogLevel) ->
 				      Extension,
 				      SslState,
                                       LogLevel);
-	(OtpCert, _DerCert, VerifyResult, SslState) when (VerifyResult == valid) or
-                                                        (VerifyResult == valid_peer) ->
+	(OtpCert, _DerCert, VerifyResult, SslState) when VerifyResult == valid;
+                                                         VerifyResult == valid_peer ->
 	     case cert_status_check(OtpCert, SslState, VerifyResult, CertPath, LogLevel) of
 		 valid ->
                      ssl_certificate:validate(OtpCert, VerifyResult, SslState, LogLevel);
@@ -2122,7 +2120,7 @@ path_validation_options(Opts, ValidationFunAndState) ->
      {verify_fun, ValidationFunAndState} | PolicyOpts].
 
 apply_user_fun(Fun, OtpCert, DerCert, VerifyResult0, UserState0, SslState, CertPath, LogLevel) when
-      (VerifyResult0 == valid) or (VerifyResult0 == valid_peer) ->
+      VerifyResult0 == valid; VerifyResult0 == valid_peer ->
     VerifyResult = maybe_check_hostname(OtpCert, VerifyResult0, SslState, LogLevel),
     case apply_fun(Fun, OtpCert, DerCert, VerifyResult, UserState0) of
 	{Valid, UserState} when (Valid == valid) orelse (Valid == valid_peer) ->
-- 
2.51.0