File 1065-ssl-Remove-dead-code.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1065-ssl-Remove-dead-code.patch of Package erlang (Revision c577547aad4fe182a4c53d158b3f41d4)

Currently displaying revision c577547aad4fe182a4c53d158b3f41d4 , Show latest

From 0289124967cd27f0ab0bbfa2f983c44d40759e9f Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Wed, 21 Apr 2021 13:54:51 +0200
Subject: [PATCH 5/5] ssl: Remove dead code

---
 lib/ssl/src/ssl_handshake.erl       | 19 +++----------------
 lib/ssl/src/tls_dtls_connection.erl |  9 +++------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 6bc18291a0..22b2199511 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -135,22 +135,9 @@ certificate(undefined, _, _, client) ->
     %% SHOULD send a certificate message containing no
     %% certificates. (chapter 7.4.6. RFC 4346)
     #certificate{asn1_certificates = []};
-certificate([OwnCert], CertDbHandle, CertDbRef, client) ->
-    Chain =
-	case ssl_certificate:certificate_chain(OwnCert, CertDbHandle, CertDbRef) of
-	    {ok, _,  CertChain} ->
-		CertChain;
-	    {error, _} ->
-                certificate(undefined, CertDbHandle, CertDbRef, client)
-        end,
-    #certificate{asn1_certificates = Chain};
-certificate([OwnCert], CertDbHandle, CertDbRef, server) ->
-    case ssl_certificate:certificate_chain(OwnCert, CertDbHandle, CertDbRef) of
-	{ok, _, Chain} ->
-	    #certificate{asn1_certificates = Chain};
-	{error, Error} ->
-            ?ALERT_REC(?FATAL, ?INTERNAL_ERROR, {server_has_no_suitable_certificates, Error})
-    end;
+certificate([OwnCert], CertDbHandle, CertDbRef, _) ->
+    {ok, _,  CertChain} = ssl_certificate:certificate_chain(OwnCert, CertDbHandle, CertDbRef),
+    #certificate{asn1_certificates = CertChain};
 certificate([_, _ |_] = Chain, _, _, _) ->
     #certificate{asn1_certificates = Chain}.
 
diff --git a/lib/ssl/src/tls_dtls_connection.erl b/lib/ssl/src/tls_dtls_connection.erl
index c27feadfcf..02c55f3941 100644
--- a/lib/ssl/src/tls_dtls_connection.erl
+++ b/lib/ssl/src/tls_dtls_connection.erl
@@ -1017,12 +1017,9 @@ certify_server(#state{handshake_env = #handshake_env{kex_algorithm = KexAlg}} =
 certify_server(#state{static_env = #static_env{cert_db = CertDbHandle,
                                                cert_db_ref = CertDbRef},
 		      session = #session{own_certificates = OwnCerts}} = State, Connection) ->
-    case ssl_handshake:certificate(OwnCerts, CertDbHandle, CertDbRef, server) of
-	Cert = #certificate{} ->
-	    Connection:queue_handshake(Cert, State);
-	Alert = #alert{} ->
-	    throw(Alert)
-    end.
+    Cert = ssl_handshake:certificate(OwnCerts, CertDbHandle, CertDbRef, server),
+    #certificate{} = Cert,  %% Assert
+    Connection:queue_handshake(Cert, State).
 
 key_exchange(#state{static_env = #static_env{role = server}, 
                     handshake_env = #handshake_env{kex_algorithm = rsa}} = State,_) ->
-- 
2.26.2

Places

File 1065-ssl-Remove-dead-code.patch of Package erlang (Revision c577547aad4fe182a4c53d158b3f41d4)

Places