From eede9cf9aa6d4816cc7c8c627e070434ee4dc984 Mon Sep 17 00:00:00 2001 From: "Scott G. Miller" Date: Thu, 1 Apr 2021 12:22:33 -0500 Subject: [PATCH] Make all duplicate removals stable in PKI --- builtin/logical/pki/cert_util.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/logical/pki/cert_util.go b/builtin/logical/pki/cert_util.go index 77b8c1f974b7..ce51f7d10da6 100644 --- a/builtin/logical/pki/cert_util.go +++ b/builtin/logical/pki/cert_util.go @@ -1000,13 +1000,13 @@ func generateCreationBundle(b *backend, data *inputBundle, caSign *certutil.CAIn subject := pkix.Name{ CommonName: cn, SerialNumber: ridSerialNumber, - Country: strutil.RemoveDuplicates(data.role.Country, false), - Organization: strutil.RemoveDuplicates(data.role.Organization, false), + Country: strutil.RemoveDuplicatesStable(data.role.Country, false), + Organization: strutil.RemoveDuplicatesStable(data.role.Organization, false), OrganizationalUnit: strutil.RemoveDuplicatesStable(data.role.OU, false), - Locality: strutil.RemoveDuplicates(data.role.Locality, false), - Province: strutil.RemoveDuplicates(data.role.Province, false), - StreetAddress: strutil.RemoveDuplicates(data.role.StreetAddress, false), - PostalCode: strutil.RemoveDuplicates(data.role.PostalCode, false), + Locality: strutil.RemoveDuplicatesStable(data.role.Locality, false), + Province: strutil.RemoveDuplicatesStable(data.role.Province, false), + StreetAddress: strutil.RemoveDuplicatesStable(data.role.StreetAddress, false), + PostalCode: strutil.RemoveDuplicatesStable(data.role.PostalCode, false), } // Get the TTL and verify it against the max allowed