File 1632-ssl-Remove-need-for-code-duplication.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1632-ssl-Remove-need-for-code-duplication.patch of Package erlang (Revision a95c38533dd94a5c195230b3b146d029)

Currently displaying revision a95c38533dd94a5c195230b3b146d029 , Show latest

From 6d4d5005f611b120d9a9d62171cb398cd3bdfc9e Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 12 Mar 2024 10:39:31 +0100
Subject: [PATCH 2/3] ssl: Remove need for code duplication

---
 lib/ssl/src/ssl_handshake.erl     | 9 +++++++--
 lib/ssl/src/tls_handshake_1_3.erl | 3 +--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 1b1fd0f181..211644365c 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -120,10 +120,12 @@
          max_frag_enum/1
 	]).
 
+%% Certificate handling
 -export([get_cert_params/1,
          select_own_cert/1,
          path_validation/10,
          validation_fun_and_state/4,
+         path_validation_options/2,
          path_validation_alert/1]).
 
 %% Tracing
@@ -2096,6 +2098,10 @@ validation_fun_and_state(undefined, VerifyState, CertPath, LogLevel) ->
 				      SslState)
      end, VerifyState}.
 
+path_validation_options(Opts, ValidationFunAndState) ->
+    [{max_path_length, maps:get(depth, Opts, ?DEFAULT_DEPTH)},
+     {verify_fun, ValidationFunAndState}].
+
 apply_user_fun(Fun, OtpCert, VerifyResult0, UserState0, SslState, CertPath, LogLevel) when
       (VerifyResult0 == valid) or (VerifyResult0 == valid_peer) ->
     VerifyResult = maybe_check_hostname(OtpCert, VerifyResult0, SslState),
@@ -3891,8 +3897,7 @@ path_validation(TrustedCert, Path, ServerName, Role, CertDbHandle, CertDbRef, CR
                                               path_len => length(Path)
                                              },
                                  Path, Level),
-    Options = [{max_path_length, maps:get(depth, Opts, ?DEFAULT_DEPTH)},
-               {verify_fun, ValidationFunAndState}],
+    Options = path_validation_options(Opts, ValidationFunAndState),
     public_key:pkix_path_validation(TrustedCert, Path, Options).
 
 error_to_propagate({error, {bad_cert, root_cert_expired}} = Error, _) ->
diff --git a/lib/ssl/src/tls_handshake_1_3.erl b/lib/ssl/src/tls_handshake_1_3.erl
index a972774022..88d9451e8d 100644
--- a/lib/ssl/src/tls_handshake_1_3.erl
+++ b/lib/ssl/src/tls_handshake_1_3.erl
@@ -1900,8 +1900,7 @@ path_validation(TrustedCert, Path, ServerName, Role, CertDbHandle, CertDbRef, CR
                                                  path_len => length(Path)
                                                 },
                                                Path, LogLevel),
-    Options = [{max_path_length, maps:get(depth, Opts, ?DEFAULT_DEPTH)},
-               {verify_fun, ValidationFunAndState}],
+    Options = ssl_handshake:path_validation_options(Opts, ValidationFunAndState),
     public_key:pkix_path_validation(TrustedCert, Path, Options).
 
 select_client_cert_key_pair(Session0,
-- 
2.35.3

Places

File 1632-ssl-Remove-need-for-code-duplication.patch of Package erlang (Revision a95c38533dd94a5c195230b3b146d029)

Places