File 3871-ssl-Rename-the-function-maybe-to-maybe_do.... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3871-ssl-Rename-the-function-maybe-to-maybe_do.patch of Package erlang (Revision 814df4a5b7f1c2bbbeb09d70cd7d94e7)

Currently displaying revision 814df4a5b7f1c2bbbeb09d70cd7d94e7 , Show latest

From 3e55f1e20e816773f0a8c08f8334ddfaba4065f4 Mon Sep 17 00:00:00 2001
From: belltoy <belltoy@gmail.com>
Date: Thu, 24 Nov 2022 17:44:20 +0800
Subject: [PATCH] ssl: Rename the function maybe to maybe_do

---
 lib/ssl/src/ssl_gen_statem.erl    |  2 +-
 lib/ssl/src/tls_handshake_1_3.erl | 32 +++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/ssl/src/ssl_gen_statem.erl b/lib/ssl/src/ssl_gen_statem.erl
index e470103074..27c38b7118 100644
--- a/lib/ssl/src/ssl_gen_statem.erl
+++ b/lib/ssl/src/ssl_gen_statem.erl
@@ -518,7 +518,7 @@ initial_hello({call, From}, {start, Timeout},
     %% ServerHello is processed.
     RequestedVersion = tls_record:hello_version(Versions),
 
-    {Ref,Maybe} = tls_handshake_1_3:maybe(),
+    {Ref,Maybe} = tls_handshake_1_3:maybe_do(),
     try
         %% Send Early Data
         State4 = Maybe(tls_handshake_1_3:maybe_send_early_data(State3)),
diff --git a/lib/ssl/src/tls_handshake_1_3.erl b/lib/ssl/src/tls_handshake_1_3.erl
index dedfb604b0..20666219b3 100644
--- a/lib/ssl/src/tls_handshake_1_3.erl
+++ b/lib/ssl/src/tls_handshake_1_3.erl
@@ -62,7 +62,7 @@
 
 -export([get_max_early_data/1,
          is_valid_binder/4,
-         maybe/0,
+         maybe_do/0,
          path_validation/10]).
 
 %% crypto:hash(sha256, "HelloRetryRequest").
@@ -632,7 +632,7 @@ do_start(#client_hello{cipher_suites = ClientCiphers,
                                 early_data := EarlyDataEnabled}} = State0) ->
     SNI = maps:get(sni, Extensions, undefined),
     EarlyDataIndication = maps:get(early_data, Extensions, undefined),
-    {Ref,Maybe} = maybe(),
+    {Ref,Maybe} = maybe_do(),
     try
         ClientGroups0 = Maybe(supported_groups_from_extensions(Extensions)),
         ClientGroups = Maybe(get_supported_groups(ClientGroups0)),
@@ -759,7 +759,7 @@ do_start(#server_hello{cipher_suite = SelectedCipherSuite,
                 session = Session0,
                 connection_states = ConnectionStates0
                } = State0) ->
-    {Ref,Maybe} = maybe(),
+    {Ref,Maybe} = maybe_do(),
     try
         ClientGroups = Maybe(get_supported_groups(ClientGroups0)),
         CookieExt = maps:get(cookie, Extensions, undefined),
@@ -848,7 +848,7 @@ do_negotiated({start_handshake, PSK0},
         ssl_record:pending_connection_state(ConnectionStates0, read),
     #security_parameters{prf_algorithm = HKDF} = SecParamsR,
 
-    {Ref,Maybe} = maybe(),
+    {Ref,Maybe} = maybe_do(),
     try
         %% Create server_hello
         ServerHello = server_hello(server_hello, SessionId, KeyShare, PSK0, ConnectionStates0),
@@ -913,7 +913,7 @@ do_negotiated({start_handshake, PSK0},
 
 
 do_wait_cert(#certificate_1_3{} = Certificate, State0) ->
-    {Ref,Maybe} = maybe(),
+    {Ref,Maybe} = maybe_do(),
     try
         Maybe(process_certificate(Certificate, State0))
     catch
@@ -925,7 +925,7 @@ do_wait_cert(#certificate_1_3{} = Certificate, State0) ->
 
 
 do_wait_cv(#certificate_verify_1_3{} = CertificateVerify, #state{static_env = #static_env{role = Role}} = State0) ->
-    {Ref,Maybe} = maybe(),
+    {Ref,Maybe} = maybe_do(),
     try
         State1 = case Role of
                      server ->
@@ -942,7 +942,7 @@ do_wait_cv(#certificate_verify_1_3{} = CertificateVerify, #state{static_env = #s
 %% TLS Server
 do_wait_finished(#finished{verify_data = VerifyData},
                  #state{static_env = #static_env{role = server}} = State0) ->
-    {Ref,Maybe} = maybe(),
+    {Ref,Maybe} = maybe_do(),
 
     try
         Maybe(validate_finished(State0, VerifyData)),
@@ -966,7 +966,7 @@ do_wait_finished(#finished{verify_data = VerifyData},
                  #state{static_env = #static_env{role = client,
                                                  protocol_cb = Connection}} = State0) ->
     
-    {Ref,Maybe} = maybe(),
+    {Ref,Maybe} = maybe_do(),
 
     try
         Maybe(validate_finished(State0, VerifyData)),
@@ -1001,7 +1001,7 @@ do_wait_sh(#server_hello{cipher_suite = SelectedCipherSuite,
                                   session_tickets := SessionTickets,
                                   use_ticket := UseTicket}} = State0) ->
     
-    {Ref,Maybe} = maybe(),
+    {Ref,Maybe} = maybe_do(),
     try
         ClientGroups = Maybe(get_supported_groups(ClientGroups0)),
         ServerKeyShare0 = maps:get(key_share, Extensions, undefined),
@@ -1058,7 +1058,7 @@ do_wait_ee(#encrypted_extensions{extensions = Extensions}, State0) ->
     ALPNProtocol = get_alpn(ALPNProtocol0),
     EarlyDataIndication = maps:get(early_data, Extensions, undefined),
 
-    {Ref, Maybe} = maybe(),
+    {Ref, Maybe} = maybe_do(),
 
     try
         %% RFC 6066: handle received/expected maximum fragment length
@@ -1084,7 +1084,7 @@ do_wait_ee(#encrypted_extensions{extensions = Extensions}, State0) ->
 
 
 do_wait_cert_cr(#certificate_1_3{} = Certificate, State0) ->
-    {Ref,Maybe} = maybe(),
+    {Ref,Maybe} = maybe_do(),
     try
         Maybe(process_certificate(Certificate, State0))
     catch
@@ -1094,7 +1094,7 @@ do_wait_cert_cr(#certificate_1_3{} = Certificate, State0) ->
             {Alert, State}
     end;
 do_wait_cert_cr(#certificate_request_1_3{} = CertificateRequest, State0) ->
-    {Ref,Maybe} = maybe(),
+    {Ref,Maybe} = maybe_do(),
     try
         Maybe(process_certificate_request(CertificateRequest, State0))
     catch
@@ -1104,7 +1104,7 @@ do_wait_cert_cr(#certificate_request_1_3{} = CertificateRequest, State0) ->
 
 
 do_wait_eoed(#end_of_early_data{}, State0) ->
-    {Ref,_Maybe} = maybe(),
+    {Ref,_Maybe} = maybe_do(),
     try
         %% Step read state to enable reading handshake messages from the client.
         %% Write state is already stepped in state 'negotiated'.
@@ -1227,7 +1227,7 @@ maybe_queue_cert_cert_cv(#state{connection_states = _ConnectionStates0,
                                                 socket = _Socket,
                                                 transport_cb = _Transport}
                                } = State0) ->
-    {Ref,Maybe} = maybe(),
+    {Ref,Maybe} = maybe_do(),
     try
         %% Create Certificate
         Certificate = Maybe(certificate(OwnCerts, CertDbHandle, CertDbRef, <<>>, client)),
@@ -1254,7 +1254,7 @@ maybe_queue_cert_verify(_Certificate,
                                static_env = #static_env{role = client,
                                                         protocol_cb = Connection}
                               } = State) ->
-    {Ref,Maybe} = maybe(),
+    {Ref,Maybe} = maybe_do(),
     try
         CertificateVerify = Maybe(certificate_verify(CertPrivateKey, SignatureScheme, State, client)),
         {ok, Connection:queue_handshake(CertificateVerify, State)}
@@ -2535,7 +2535,7 @@ get_alpn(ALPNProtocol0) ->
             ALPNProtocol
     end.
 
-maybe() ->
+maybe_do() ->
     Ref = erlang:make_ref(),
     Ok = fun(ok) -> ok;
             ({ok,R}) -> R;
-- 
2.35.3

Places

File 3871-ssl-Rename-the-function-maybe-to-maybe_do.patch of Package erlang (Revision 814df4a5b7f1c2bbbeb09d70cd7d94e7)

Places