fixup: Handle map to initial

erlang · Nov 1, 2023 · f8d06b2 · f8d06b2
1 parent 7673473
commit f8d06b2
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl
@@ -1064,10 +1064,16 @@ handle_policy_mapping_ext(#'PolicyMappings_SEQOF'{
         fun(#{valid_policy := ValidPolicy, expected_policy_set := Set} = Node)
               when ValidPolicy == IssuerPolicy ->
                 case Set of %% Initial policy should be mapped over, but can be mapped to itself
-                    [ValidPolicy] when SubjectPolicy =/= ValidPolicy ->
+                    [ValidPolicy] when ValidPolicy =/= SubjectPolicy ->
                         Node#{expected_policy_set => [SubjectPolicy]};
                     _ ->
-                        Node#{expected_policy_set => Set ++ [SubjectPolicy]}
+                        %% Avoid duplicating self mapping
+                        case lists:member(SubjectPolicy, Set) of
+                            true ->
+                                Node;
+                            false ->
+                                Node#{expected_policy_set => Set ++ [SubjectPolicy]}
+                        end
                 end;
            (Node) ->
                 Node