File 1442-fix-crl-unwrap-outer-list-of-CRLs-when-an-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1442-fix-crl-unwrap-outer-list-of-CRLs-when-an-URI-is-pro.patch of Package erlang (Revision a2c746346df91f7eba485155dba10e85)

Currently displaying revision a2c746346df91f7eba485155dba10e85 , Show latest

From 29882533faaea4851cc0723e5bfb3e942139a3ba Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Tue, 21 Jun 2022 11:37:17 -0300
Subject: [PATCH 2/4] fix(crl): unwrap outer list of CRLs when an URI is
 provided (delete)

---
 lib/ssl/src/ssl_pkix_db.erl    | 2 +-
 lib/ssl/test/ssl_crl_SUITE.erl | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/ssl/src/ssl_pkix_db.erl b/lib/ssl/src/ssl_pkix_db.erl
index 88ef23a60a..d7e83c8f41 100644
--- a/lib/ssl/src/ssl_pkix_db.erl
+++ b/lib/ssl/src/ssl_pkix_db.erl
@@ -365,7 +365,7 @@ remove_crls([_,_,_, {Cache, Mapping} | _], Path) ->
     case lookup(Path, Cache) of
 	undefined ->
 	    ok;
-	CRLs ->
+	[CRLs] ->
 	    remove(Path, Cache),
 	    [rm_crls(CRL, Mapping) || CRL <- CRLs]
     end.
diff --git a/lib/ssl/test/ssl_crl_SUITE.erl b/lib/ssl/test/ssl_crl_SUITE.erl
index ce614cbfeb..97abcb3592 100644
--- a/lib/ssl/test/ssl_crl_SUITE.erl
+++ b/lib/ssl/test/ssl_crl_SUITE.erl
@@ -244,8 +244,11 @@ crl_verify_valid(Config) when is_list(Config) ->
     ssl_crl_cache:insert("http://localhost/otpCA/crl.pem", {file, filename:join([PrivDir, "otpCA", "crl.pem"])}),
     ssl_crl_cache:insert({file, filename:join([PrivDir, "erlangCA", "crl.pem"])}),
     ssl_crl_cache:insert({file, filename:join([PrivDir, "otpCA", "crl.pem"])}),
-    
-    crl_verify_valid(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts).
+
+    crl_verify_valid(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts),
+
+    %% check that delete WITH URI works as well.
+    ssl_crl_cache:delete("http://localhost/erlangCA/crl.pem").
 
 crl_verify_revoked() ->
     [{doc,"Verify a simple CRL chain when peer cert is reveoked"}].
-- 
2.35.3

Places

File 1442-fix-crl-unwrap-outer-list-of-CRLs-when-an-URI-is-pro.patch of Package erlang (Revision a2c746346df91f7eba485155dba10e85)

Places