From a6f4b29ffc998bbdd89b55ef3508556aafed8a97 Mon Sep 17 00:00:00 2001
From: "Justin R. Wilson" <wilsonj@unityfoundation.io>
Date: Mon, 16 Oct 2023 09:59:53 -0500
Subject: [PATCH] tests/security/attributes/run_test.pl multiple_grants is
 broken

Problem
-------

tests/security/attributes/run_test.pl multiple_grants was broken by #4201.

Solution
--------

Correct the subject name.
---
 ...missions_multi_p_01_02_03_04_readwrite.xml |  2 +-
 ...s_multi_p_01_02_03_04_readwrite_signed.p7s | 87 +++++++++----------
 2 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/tests/security/attributes/permissions/permissions_multi_p_01_02_03_04_readwrite.xml b/tests/security/attributes/permissions/permissions_multi_p_01_02_03_04_readwrite.xml
index ea42024ede0..115b8981918 100644
--- a/tests/security/attributes/permissions/permissions_multi_p_01_02_03_04_readwrite.xml
+++ b/tests/security/attributes/permissions/permissions_multi_p_01_02_03_04_readwrite.xml
@@ -1023,7 +1023,7 @@
     </grant>
     <grant name="factory_grant_readwrite_domain_0">
       <!-- only allow joining domain 0. Explicit permission to read and write protected topics -->
-      <subject_name>/C=GB/ST=JQ/O=Bob's Magical Widget Factory/CN=Roberto Gonzales/emailAddress=bob@magicalwidgets.com</subject_name>
+      <subject_name>emailAddress=bob@magicalwidgets.com,CN=Roberto Gonzales,O=Bob's Magical Widget Factory,ST=JQ,C=GB</subject_name>
       <validity>
         <!-- Format is CCYY-MM-DDThh:mm:ss[Z|(+|-)hh:mm] in GMT -->
         <not_before>2015-09-15T01:00:00</not_before>
diff --git a/tests/security/attributes/permissions/permissions_multi_p_01_02_03_04_readwrite_signed.p7s b/tests/security/attributes/permissions/permissions_multi_p_01_02_03_04_readwrite_signed.p7s
index 0ec808633d4..bdad2019b72 100644
--- a/tests/security/attributes/permissions/permissions_multi_p_01_02_03_04_readwrite_signed.p7s
+++ b/tests/security/attributes/permissions/permissions_multi_p_01_02_03_04_readwrite_signed.p7s
@@ -1,9 +1,9 @@
 MIME-Version: 1.0
-Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg="sha1"; boundary="----D9BE09E10BBB2EB78E241A9E2F558DF6"
+Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg="sha-256"; boundary="----C38497FE2AC07AEDA2590E69E656B3C7"
 
 This is an S/MIME signed message
 
-------D9BE09E10BBB2EB78E241A9E2F558DF6
+------C38497FE2AC07AEDA2590E69E656B3C7
 Content-Type: text/plain
 
 <?xml version="1.0"?>
@@ -1031,7 +1031,7 @@ Content-Type: text/plain
     </grant>
     <grant name="factory_grant_readwrite_domain_0">
       <!-- only allow joining domain 0. Explicit permission to read and write protected topics -->
-      <subject_name>/C=GB/ST=JQ/O=Bob's Magical Widget Factory/CN=Roberto Gonzales/emailAddress=bob@magicalwidgets.com</subject_name>
+      <subject_name>emailAddress=bob@magicalwidgets.com,CN=Roberto Gonzales,O=Bob's Magical Widget Factory,ST=JQ,C=GB</subject_name>
       <validity>
         <!-- Format is CCYY-MM-DDThh:mm:ss[Z|(+|-)hh:mm] in GMT -->
         <not_before>2015-09-15T01:00:00</not_before>
@@ -2052,50 +2052,49 @@ Content-Type: text/plain
   </permissions>
 </dds>
 
-------D9BE09E10BBB2EB78E241A9E2F558DF6
+------C38497FE2AC07AEDA2590E69E656B3C7
 Content-Type: application/x-pkcs7-signature; name="smime.p7s"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime.p7s"
 
-MIIHLAYJKoZIhvcNAQcCoIIHHTCCBxkCAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3
-DQEHAaCCA/gwggP0MIIC3AIJAKSOim/ArjfyMA0GCSqGSIb3DQEBCwUAMIG7MQsw
-CQYDVQQGEwJVUzELMAkGA1UECAwCTU8xFDASBgNVBAcMC1NhaW50IExvdWlzMS8w
-LQYDVQQKDCZPYmplY3QgQ29tcHV0aW5nIChUZXN0IFBlcm1pc3Npb25zIENBKTEv
-MC0GA1UEAwwmT2JqZWN0IENvbXB1dGluZyAoVGVzdCBQZXJtaXNzaW9ucyBDQSkx
-JzAlBgkqhkiG9w0BCQEWGGluZm9Ab2JqZWN0Y29tcHV0aW5nLmNvbTAeFw0xODA2
-MTMwNDIwMTNaFw0yODA2MTAwNDIwMTNaMIG7MQswCQYDVQQGEwJVUzELMAkGA1UE
-CAwCTU8xFDASBgNVBAcMC1NhaW50IExvdWlzMS8wLQYDVQQKDCZPYmplY3QgQ29t
-cHV0aW5nIChUZXN0IFBlcm1pc3Npb25zIENBKTEvMC0GA1UEAwwmT2JqZWN0IENv
-bXB1dGluZyAoVGVzdCBQZXJtaXNzaW9ucyBDQSkxJzAlBgkqhkiG9w0BCQEWGGlu
-Zm9Ab2JqZWN0Y29tcHV0aW5nLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAJ3eiwIeyTCJY+SBD4WJQkQ+P2UYBXqCqcb1dxMc/M6y/6GtZySWrhZx
-Ny7kRHGO/DOt8H0xXYmPWaGcBB+nSwi5Ml7hCheKDJ/QjJ7OxIDWh6h+Qm4GUDpx
-H7kBPN80RwkkbexVoRprQv3YJdvXjstzMwxj7oj+MP0f8pqaimHWEKB2HaUadg33
-sRMzFfmog22E7Xv+pnnlH4fmcTY6nV/hjQuGMq7dbO0SMhl4AkOACSyhhHKdWF8O
-yyF1lZQxI7SMckY/AS/HCFOwCSdZ22G4T/GBlCoM/dpePcwUlxmTJ1L7zG+dfRy4
-eyv/sypUrSg6aNZLumLtwwFj0O0HcpUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-T1BZrXE2PEtYjDzx5WtDE4EIiWoKQCJPHakC6sR2IO3PxlB0MxBCagC6mlPotZVW
-05ZzVs/dr4gcGiU0CKZc6b4H18xK9CepFuuIlnwdzn5jlNeUneLKokMTI+JaFQUt
-9B+eMTyFEvmgo+SGTaBELornH7XRxkxyWASZk40A20C5Im6syHCCovHCAbDnVoik
-votPG11nfcsg8zwA3nVOCPm3ZUz/j2I2r0d2oCXtVC7IcRz94IAinunr2epylL1U
-EkAmgc3yWYMMdjEz6li1ACCYEosHFPIOuAln7ePcVU6nSitHFqsTdeMn7RshWc7r
-KGO6c86mCzIRzEf3/sSebzGCAvwwggL4AgEBMIHJMIG7MQswCQYDVQQGEwJVUzEL
-MAkGA1UECAwCTU8xFDASBgNVBAcMC1NhaW50IExvdWlzMS8wLQYDVQQKDCZPYmpl
-Y3QgQ29tcHV0aW5nIChUZXN0IFBlcm1pc3Npb25zIENBKTEvMC0GA1UEAwwmT2Jq
-ZWN0IENvbXB1dGluZyAoVGVzdCBQZXJtaXNzaW9ucyBDQSkxJzAlBgkqhkiG9w0B
-CQEWGGluZm9Ab2JqZWN0Y29tcHV0aW5nLmNvbQIJAKSOim/ArjfyMAkGBSsOAwIa
-BQCgggEHMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8X
-DTIzMDcyNTE1MTIxNlowIwYJKoZIhvcNAQkEMRYEFHNzQSWzt/1WubiGbNyfhvTG
-Ff8lMIGnBgkqhkiG9w0BCQ8xgZkwgZYwCwYJYIZIAWUDBAEqMAgGBiqFAwICCTAK
-BggqhQMHAQECAjAKBggqhQMHAQECAzAIBgYqhQMCAhUwCwYJYIZIAWUDBAEWMAsG
-CWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcN
-AwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEggEA
-iVgfDGGpwFhqxDixccOkHrrDjMGgFvo6O6ceIUxpjtB3A4VpSvhNN+oVXjLNhLAc
-fzeL28hd2tOrQpTe5hWYt8uXQV+jOHOVTLVwfho4yFxDZ9/eOafg05gOlfDsg4m9
-9r71hht64zszIgKBNJHHtztNBRurRmyZqr3GLpdksajmPVKcLAk3OkTm59dKIQ5c
-09XoMUUq+g6csAoMBQmF3iHBsDJGtg358JMsUpZSBLqFn0cmg3E1imwboG+qiNsY
-dXF1s1BsmsWQIS/GjF8jCDRPue96tAhvcXJqoww6W6wyDc1XRtxEIjf8Ds5+7HHa
-2YeBDjUS2mwNe6u6KI5AjA==
+MIIHEAYJKoZIhvcNAQcCoIIHATCCBv0CAQExDzANBglghkgBZQMEAgEFADALBgkq
+hkiG9w0BBwGgggP4MIID9DCCAtwCCQCkjopvwK438jANBgkqhkiG9w0BAQsFADCB
+uzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1PMRQwEgYDVQQHDAtTYWludCBMb3Vp
+czEvMC0GA1UECgwmT2JqZWN0IENvbXB1dGluZyAoVGVzdCBQZXJtaXNzaW9ucyBD
+QSkxLzAtBgNVBAMMJk9iamVjdCBDb21wdXRpbmcgKFRlc3QgUGVybWlzc2lvbnMg
+Q0EpMScwJQYJKoZIhvcNAQkBFhhpbmZvQG9iamVjdGNvbXB1dGluZy5jb20wHhcN
+MTgwNjEzMDQyMDEzWhcNMjgwNjEwMDQyMDEzWjCBuzELMAkGA1UEBhMCVVMxCzAJ
+BgNVBAgMAk1PMRQwEgYDVQQHDAtTYWludCBMb3VpczEvMC0GA1UECgwmT2JqZWN0
+IENvbXB1dGluZyAoVGVzdCBQZXJtaXNzaW9ucyBDQSkxLzAtBgNVBAMMJk9iamVj
+dCBDb21wdXRpbmcgKFRlc3QgUGVybWlzc2lvbnMgQ0EpMScwJQYJKoZIhvcNAQkB
+FhhpbmZvQG9iamVjdGNvbXB1dGluZy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCd3osCHskwiWPkgQ+FiUJEPj9lGAV6gqnG9XcTHPzOsv+hrWck
+lq4WcTcu5ERxjvwzrfB9MV2Jj1mhnAQfp0sIuTJe4QoXigyf0IyezsSA1oeofkJu
+BlA6cR+5ATzfNEcJJG3sVaEaa0L92CXb147LczMMY+6I/jD9H/Kamoph1hCgdh2l
+GnYN97ETMxX5qINthO17/qZ55R+H5nE2Op1f4Y0LhjKu3WztEjIZeAJDgAksoYRy
+nVhfDsshdZWUMSO0jHJGPwEvxwhTsAknWdthuE/xgZQqDP3aXj3MFJcZkydS+8xv
+nX0cuHsr/7MqVK0oOmjWS7pi7cMBY9DtB3KVAgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggEBAE9QWa1xNjxLWIw88eVrQxOBCIlqCkAiTx2pAurEdiDtz8ZQdDMQQmoAuppT
+6LWVVtOWc1bP3a+IHBolNAimXOm+B9fMSvQnqRbriJZ8Hc5+Y5TXlJ3iyqJDEyPi
+WhUFLfQfnjE8hRL5oKPkhk2gRC6K5x+10cZMclgEmZONANtAuSJurMhwgqLxwgGw
+51aIpL6LTxtdZ33LIPM8AN51Tgj5t2VM/49iNq9HdqAl7VQuyHEc/eCAIp7p69nq
+cpS9VBJAJoHN8lmDDHYxM+pYtQAgmBKLBxTyDrgJZ+3j3FVOp0orRxarE3XjJ+0b
+IVnO6yhjunPOpgsyEcxH9/7Enm8xggLcMIIC2AIBATCByTCBuzELMAkGA1UEBhMC
+VVMxCzAJBgNVBAgMAk1PMRQwEgYDVQQHDAtTYWludCBMb3VpczEvMC0GA1UECgwm
+T2JqZWN0IENvbXB1dGluZyAoVGVzdCBQZXJtaXNzaW9ucyBDQSkxLzAtBgNVBAMM
+Jk9iamVjdCBDb21wdXRpbmcgKFRlc3QgUGVybWlzc2lvbnMgQ0EpMScwJQYJKoZI
+hvcNAQkBFhhpbmZvQG9iamVjdGNvbXB1dGluZy5jb20CCQCkjopvwK438jANBglg
+hkgBZQMEAgEFAKCB5DAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3
+DQEJBTEPFw0yMzEwMTYxNDUwMTlaMC8GCSqGSIb3DQEJBDEiBCCJWxmzU4igldXl
+4AYqk0k8snSYN6VHkf+UPSQ0KdlNCDB5BgkqhkiG9w0BCQ8xbDBqMAsGCWCGSAFl
+AwQBKjALBglghkgBZQMEARYwCwYJYIZIAWUDBAECMAoGCCqGSIb3DQMHMA4GCCqG
+SIb3DQMCAgIAgDANBggqhkiG9w0DAgIBQDAHBgUrDgMCBzANBggqhkiG9w0DAgIB
+KDANBgkqhkiG9w0BAQEFAASCAQB8r58BqVtZOPxdmfl1cIhWZ0MM26ceDWBwtlA2
+60scqAMcV/Z1Vl7YHF/4mHCWR77o3xe0cPL/HqbqjuPnPHjKlEd3Ore7uxp9x2KJ
+Oylv9Q39WWcizMRmc/UGl5B3GmyD9I7PpqrHC181vfAHXIhTm0e0VnoWpuQNDkFM
++qnJAc7EmpPLnU5EPn24SPUSaJXHszeCQhs2z4Iot7bGjNgCtOrrrTqx2xocjcnG
+dzZBGKRIsPRHQ89X+UkKPFKQlnFs1Jb6DZKuHiEwQWb6tr0HsaZqrpBQZ6Xs9MEo
+z4oFLT2uG1BEKAjN/2Y9Kk4JTKSYMhqo9JPD7uIB3sv4gf3p
 
-------D9BE09E10BBB2EB78E241A9E2F558DF6--
+------C38497FE2AC07AEDA2590E69E656B3C7--