From 3a67736bb9b7873d26a44a7d32b98a2da98d2db6 Mon Sep 17 00:00:00 2001
From: Greg Hudson <ghudson@mit.edu>
Date: Sun, 17 Feb 2019 19:51:35 -0500
Subject: [PATCH] Use better name type for PKINIT KDC certs

RFC 4120 recommends NT-SRV-INST for krbtgt principals; use it in
PKINIT KDC certificates rather than NT-PRINCIPAL.  Regenerate test
certificates.  Reported by Rick van Rein.

ticket: 8784 (new)
---
 doc/admin/pkinit.rst                          |   2 +-
 src/tests/dejagnu/pkinit-certs/ca.pem         |  32 +++++------
 src/tests/dejagnu/pkinit-certs/generic.p12    | Bin 2477 -> 2477 bytes
 src/tests/dejagnu/pkinit-certs/generic.pem    |  26 ++++-----
 src/tests/dejagnu/pkinit-certs/kdc.pem        |  34 ++++++------
 src/tests/dejagnu/pkinit-certs/make-certs.sh  |   3 +-
 .../dejagnu/pkinit-certs/privkey-enc.pem      |  52 +++++++++---------
 src/tests/dejagnu/pkinit-certs/privkey.pem    |  50 ++++++++---------
 src/tests/dejagnu/pkinit-certs/user-enc.p12   | Bin 2837 -> 2837 bytes
 src/tests/dejagnu/pkinit-certs/user-upn.p12   | Bin 2829 -> 2829 bytes
 src/tests/dejagnu/pkinit-certs/user-upn.pem   |  30 +++++-----
 src/tests/dejagnu/pkinit-certs/user-upn2.p12  | Bin 2813 -> 2813 bytes
 src/tests/dejagnu/pkinit-certs/user-upn2.pem  |  32 +++++------
 src/tests/dejagnu/pkinit-certs/user-upn3.p12  | Bin 2829 -> 2829 bytes
 src/tests/dejagnu/pkinit-certs/user-upn3.pem  |  30 +++++-----
 src/tests/dejagnu/pkinit-certs/user.p12       | Bin 2837 -> 2837 bytes
 src/tests/dejagnu/pkinit-certs/user.pem       |  30 +++++-----
 17 files changed, 161 insertions(+), 160 deletions(-)

diff --git a/doc/admin/pkinit.rst b/doc/admin/pkinit.rst
index bec4fc800c..8f663f2e51 100644
--- a/doc/admin/pkinit.rst
+++ b/doc/admin/pkinit.rst
@@ -72,7 +72,7 @@ First, you will need a file containing the following::
     principal_name=EXP:1,SEQUENCE:kdc_principal_seq
 
     [kdc_principal_seq]
-    name_type=EXP:0,INTEGER:1
+    name_type=EXP:0,INTEGER:2
     name_string=EXP:1,SEQUENCE:kdc_principals
 
     [kdc_principals]
diff --git a/src/tests/dejagnu/pkinit-certs/ca.pem b/src/tests/dejagnu/pkinit-certs/ca.pem
index f7421ba024..2d7ab9d0e9 100644
--- a/src/tests/dejagnu/pkinit-certs/ca.pem
+++ b/src/tests/dejagnu/pkinit-certs/ca.pem
@@ -3,27 +3,27 @@ MIIE5TCCA82gAwIBAgIBATANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
 FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
 A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
 dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
-b3RoZXJ3aXNlMB4XDTE3MDgyNTE4MzIxMFoXDTI4MDgwNzE4MzIxMFowgacxCzAJ
+b3RoZXJ3aXNlMB4XDTE5MDIxODAwMjU1NVoXDTMwMDEzMTAwMjU1NVowgacxCzAJ
 BgNVBAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRzMRIwEAYDVQQHDAlDYW1i
 cmlkZ2UxDDAKBgNVBAoMA01JVDEpMCcGA1UECwwgSW5zZWN1cmUgUEtJTklUIEtl
 cmJlcm9zIHRlc3QgQ0ExMzAxBgNVBAMMKnBraW5pdCB0ZXN0IHN1aXRlIENBOyBk
 byBub3QgdXNlIG90aGVyd2lzZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL8HFT/+Uia/TcSFIJJd7Z7ZFvMOYLhEkCyqRhW1ggDp0xrIAoh/fyxq4qId
-S8f7Aurf39kzyS9NtDD2snKwfoLaZpunIXNLCujrlrqdhKsZdtl8aYLmjIhTLu4r
-rN5WZIRQULbkLiuqc6ZFOjOZxkR0NkC/CyfQTJO5a2TaMrweLswmY0k5KlAoevps
-h+LPXsLC66sqgYuWDD8c1Z9GlI8dW2abRPt+WUKskEgHqYJrCkjvPIZgS7UDAzpU
-OCXopDDr/qQ9dnAYzt98r/pCx621/2R4JttZbdsXQDbQaHhV69iJqACqZB0lLyKO
-Ka4Y2U5zy3++t6pd3oGlWCr96D0CAwEAAaOCARgwggEUMB0GA1UdDgQWBBSvEuBX
-VNKtIomCkLcxpsKp9Ag9qzCB1AYDVR0jBIHMMIHJgBSvEuBXVNKtIomCkLcxpsKp
-9Ag9q6GBraSBqjCBpzELMAkGA1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0
+ggEBAL6unmewooH+XR9tvj5VtwD+uUyd+YIBseWjQZfl447qdmNah3tqP6VCBGr4
+N3fYZrrPKL7CRLlsbF8qP52r6UnEjVGwVuYoNo4Eps0DgNS7+XcxviYBe9RCPJH3
+t/2PtY7NrnaW7A/h471N0IGTjwzudeIBixLfFKcn8prwQc+6IQ6Tz3Rg/4XCTFxI
+kjby4VWyKBDWOpea3gPM9dvR7PiVsnCfCJlFB+9m7enD9+PFrie0UM7ezawZ514j
+xo1luZfXsFJDpB6Zi3iAA8gNzVAF2CONMISZDlD4bTFtj58zPQmChaQlYeEise9Y
+gfSjuWOLCx7PZ3l0J3Joba+pcxECAwEAAaOCARgwggEUMB0GA1UdDgQWBBRsTf69
+b/J43+2sVy3nOfj8nmyOFjCB1AYDVR0jBIHMMIHJgBRsTf69b/J43+2sVy3nOfj8
+nmyOFqGBraSBqjCBpzELMAkGA1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0
 dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoGA1UECgwDTUlUMSkwJwYDVQQLDCBJ
 bnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVzdCBDQTEzMDEGA1UEAwwqcGtpbml0
 IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ugb3RoZXJ3aXNlggEBMAsGA1UdDwQE
-AwIB/jAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQArUoCjqxsY
-/m3nx/5BQSkBAL4T5RgWIX+L4y4GXloYYlafpw+SxRq0QffFm5fpCJBnMd21MbPl
-k/YA+oq0/76cKyQmJ6h/Wl4KHCKKMmvGuhCEXzmrevk/EJ8lJXNdPfbBueAuLeyU
-7X9tO8i9fJ59AZ9YWD9d//puOF+8xeHPxJIxHcR2jHpUOJPtm4yVu1LreHiJJTu4
-Xotp9yMpJu/uJM3aBKVS5N/5JreraLj9N6N8nZ/7nEw9Dj1zzGHcHCcqtcxz1oOH
-Zbg5Jo8HhVhIHxKdKLvwEk60P+lkGFIE+IUmhWfcbbprTGs7VhxREwxaWyCapCOk
-qlhbJdEcjHr2
+AwIB/jAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAGdouyTbxO
+bnyMr6hEDnMLRrSqwozfLGnfJIrUxvwtn/9UAlFuCpnfNi1xQkwimW8zXOHlCoAF
+fpeE7zpotmN6xbg2u98J9QOo7vGfoADvVgiZaDMq+Tv52ZG0OtbzTe/LyCXnjanM
+G+Rgjhbmy2HW1orghyDUa5Qy9ISv4d72yOKGVjK8xxItnf9i7tRARVqqJk5p81QD
+WOBc7FUZNj5jYw38YPHqmZtwlr1DhCNeXwVi5GpwPrYwFAaqGuTnspfkpcDA8wEm
+iVvs7Gy69C0zy4Yz2I9ZzsDjmTV8PyZdMaZIhhpBHjQmBm+Pol/q5BubjFeAsPSU
+/YaKjpqk1jNg
 -----END CERTIFICATE-----
diff --git a/src/tests/dejagnu/pkinit-certs/generic.p12 b/src/tests/dejagnu/pkinit-certs/generic.p12
index 238baa56bc7b4ec4a4cd66861d9a54888ae6baf8..90de08f7290db45f9bee9c4220537f97e2ac20f5 100644
GIT binary patch
delta 2343
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
Nxkw>m2M+=Q2mnX`dK>@%

delta 2343
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
NLHABa6l?+l2mtYcVB7!z

diff --git a/src/tests/dejagnu/pkinit-certs/generic.pem b/src/tests/dejagnu/pkinit-certs/generic.pem
index 706c2f341c..c16d0e7c50 100644
--- a/src/tests/dejagnu/pkinit-certs/generic.pem
+++ b/src/tests/dejagnu/pkinit-certs/generic.pem
@@ -3,19 +3,19 @@ MIIDZjCCAk4CAQcwDQYJKoZIhvcNAQELBQAwgacxCzAJBgNVBAYTAlVTMRYwFAYD
 VQQIDA1NYXNzYWNodXNldHRzMRIwEAYDVQQHDAlDYW1icmlkZ2UxDDAKBgNVBAoM
 A01JVDEpMCcGA1UECwwgSW5zZWN1cmUgUEtJTklUIEtlcmJlcm9zIHRlc3QgQ0Ex
 MzAxBgNVBAMMKnBraW5pdCB0ZXN0IHN1aXRlIENBOyBkbyBub3QgdXNlIG90aGVy
-d2lzZTAeFw0xNzA4MjUxODMyMTFaFw0yODA4MDcxODMyMTFaMEoxCzAJBgNVBAYT
+d2lzZTAeFw0xOTAyMTgwMDI1NTZaFw0zMDAxMzEwMDI1NTZaMEoxCzAJBgNVBAYT
 AlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRzMRQwEgYDVQQKDAtLUkJURVNULkNP
 TTENMAsGA1UEAwwEdXNlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AL8HFT/+Uia/TcSFIJJd7Z7ZFvMOYLhEkCyqRhW1ggDp0xrIAoh/fyxq4qIdS8f7
-Aurf39kzyS9NtDD2snKwfoLaZpunIXNLCujrlrqdhKsZdtl8aYLmjIhTLu4rrN5W
-ZIRQULbkLiuqc6ZFOjOZxkR0NkC/CyfQTJO5a2TaMrweLswmY0k5KlAoevpsh+LP
-XsLC66sqgYuWDD8c1Z9GlI8dW2abRPt+WUKskEgHqYJrCkjvPIZgS7UDAzpUOCXo
-pDDr/qQ9dnAYzt98r/pCx621/2R4JttZbdsXQDbQaHhV69iJqACqZB0lLyKOKa4Y
-2U5zy3++t6pd3oGlWCr96D0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAAniIG+xJ
-6rXbrH2kt40GE58fFzrIlzhG4VzncNnpFitvPEMzN0kMa5LBX5/zSYiMawQBQ7C0
-FpCjz+n82VVW8iabCNoqUUNwOP7ZYmsoraHT9klSak/mLfAXOyOG3DUV9jntivnl
-HUIiDO7Pf6GnVVROio9psQEVOX1+W1uq9Vs79+F5GI/s0QR9dG0qXvdJ0h5UdVee
-8LVXQOi3cQKyBOwECwt0HA0pJwwcD6w9e8Y2NYTeOTamWGQVEV3NlcvtdSVuDJ8y
-lTke2YbEKyHdcsQ1vrDHtdyfEmJcgO5c9EL5ptYJB7Yv1QiwWJOhLdT13IBYvOtO
-ebOF6zAD73Bpkw==
+AL6unmewooH+XR9tvj5VtwD+uUyd+YIBseWjQZfl447qdmNah3tqP6VCBGr4N3fY
+ZrrPKL7CRLlsbF8qP52r6UnEjVGwVuYoNo4Eps0DgNS7+XcxviYBe9RCPJH3t/2P
+tY7NrnaW7A/h471N0IGTjwzudeIBixLfFKcn8prwQc+6IQ6Tz3Rg/4XCTFxIkjby
+4VWyKBDWOpea3gPM9dvR7PiVsnCfCJlFB+9m7enD9+PFrie0UM7ezawZ514jxo1l
+uZfXsFJDpB6Zi3iAA8gNzVAF2CONMISZDlD4bTFtj58zPQmChaQlYeEise9YgfSj
+uWOLCx7PZ3l0J3Joba+pcxECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAevA9z6cL
+a+qiNfp4ssOo3ub87vrQZnayulbrU9rcRoVuqFZGbIvH7+dbQwZE34RP/R1N/ZCR
+ElaU6VNqnMYv/1pqzGnk59b7Z00hiOSblfifPt7IM+uHZRUGrgQ37dC7SyHvjSi7
+kZsSCJRc6Fjv6O/qBBp2jui1B9ZBWXQ+FBmX6YMdD/VYiD1ivpacd9YueLrHnzCm
+iIM5V/uBAiUZHLoFhkhtWDMvRBJLNHqP2zWGffg4K7jKsCriAfCcp+VUfXRAZelo
+Hp1C5HFLID0UIXvSStOnhtM1HuQAROJS9eqqz6E4irl2ujxT8vEfbZFHDpD+Cdy1
+MgVZAqL7rPjILA==
 -----END CERTIFICATE-----
diff --git a/src/tests/dejagnu/pkinit-certs/kdc.pem b/src/tests/dejagnu/pkinit-certs/kdc.pem
index 4eb811deba..14ac0008b2 100644
--- a/src/tests/dejagnu/pkinit-certs/kdc.pem
+++ b/src/tests/dejagnu/pkinit-certs/kdc.pem
@@ -3,27 +3,27 @@ MIIE4TCCA8mgAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
 FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
 A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
 dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
-b3RoZXJ3aXNlMB4XDTE3MDgyNTE4MzIxMFoXDTI4MDgwNzE4MzIxMFowSTELMAkG
+b3RoZXJ3aXNlMB4XDTE5MDIxODAwMjU1NVoXDTMwMDEzMTAwMjU1NVowSTELMAkG
 A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
 U1QuQ09NMQwwCgYDVQQDDANLREMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC/BxU//lImv03EhSCSXe2e2RbzDmC4RJAsqkYVtYIA6dMayAKIf38sauKi
-HUvH+wLq39/ZM8kvTbQw9rJysH6C2mabpyFzSwro65a6nYSrGXbZfGmC5oyIUy7u
-K6zeVmSEUFC25C4rqnOmRTozmcZEdDZAvwsn0EyTuWtk2jK8Hi7MJmNJOSpQKHr6
-bIfiz17CwuurKoGLlgw/HNWfRpSPHVtmm0T7fllCrJBIB6mCawpI7zyGYEu1AwM6
-VDgl6KQw6/6kPXZwGM7ffK/6Qsettf9keCbbWW3bF0A20Gh4VevYiagAqmQdJS8i
-jimuGNlOc8t/vreqXd6BpVgq/eg9AgMBAAGjggFzMIIBbzAdBgNVHQ4EFgQUrxLg
-V1TSrSKJgpC3MabCqfQIPaswgdQGA1UdIwSBzDCByYAUrxLgV1TSrSKJgpC3MabC
-qfQIPauhga2kgaowgacxCzAJBgNVBAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNl
+AoIBAQC+rp5nsKKB/l0fbb4+VbcA/rlMnfmCAbHlo0GX5eOO6nZjWod7aj+lQgRq
++Dd32Ga6zyi+wkS5bGxfKj+dq+lJxI1RsFbmKDaOBKbNA4DUu/l3Mb4mAXvUQjyR
+97f9j7WOza52luwP4eO9TdCBk48M7nXiAYsS3xSnJ/Ka8EHPuiEOk890YP+Fwkxc
+SJI28uFVsigQ1jqXmt4DzPXb0ez4lbJwnwiZRQfvZu3pw/fjxa4ntFDO3s2sGede
+I8aNZbmX17BSQ6QemYt4gAPIDc1QBdgjjTCEmQ5Q+G0xbY+fMz0JgoWkJWHhIrHv
+WIH0o7ljiwsez2d5dCdyaG2vqXMRAgMBAAGjggFzMIIBbzAdBgNVHQ4EFgQUbE3+
+vW/yeN/trFct5zn4/J5sjhYwgdQGA1UdIwSBzDCByYAUbE3+vW/yeN/trFct5zn4
+/J5sjhahga2kgaowgacxCzAJBgNVBAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNl
 dHRzMRIwEAYDVQQHDAlDYW1icmlkZ2UxDDAKBgNVBAoMA01JVDEpMCcGA1UECwwg
 SW5zZWN1cmUgUEtJTklUIEtlcmJlcm9zIHRlc3QgQ0ExMzAxBgNVBAMMKnBraW5p
 dCB0ZXN0IHN1aXRlIENBOyBkbyBub3QgdXNlIG90aGVyd2lzZYIBATALBgNVHQ8E
 BAMCA+gwDAYDVR0TAQH/BAIwADBIBgNVHREEQTA/oD0GBisGAQUCAqAzMDGgDRsL
-S1JCVEVTVC5DT02hIDAeoAMCAQGhFzAVGwZrcmJ0Z3QbC0tSQlRFU1QuQ09NMBIG
-A1UdJQQLMAkGBysGAQUCAwUwDQYJKoZIhvcNAQELBQADggEBAFMX7ZTpNPdzFwkE
-hrab7fSDeoG+mN0yorY8e5Evx6sE7pXOtHgHIjQY2Ys0lk2mhbsIKptL/R6jTxWR
-rbmU6jFNFeJgn5ba3NWdhlUiZ8WKe2knp6uc9ZDIK007XaKA4rRoHlJ3vHXoF+ga
-JFOYwRzCtAlmsOCQ0UetoC3Ju6Y6NhCXIE8f81dsh6RMADoQT0n/fcLY/JtbbLXK
-ANTIWHm0oSX9wvOU/yZkYGuwcPd91cc6Mea8f3J8D/OiatMZXc3719extmeR6Cv6
-aba31kv9wtbxVuxkR7HhjlJhzhqfzfIp3tNREaIxPb/qKGWBOjwxGRqSUkdEqMvD
-GjaSlyc=
+S1JCVEVTVC5DT02hIDAeoAMCAQKhFzAVGwZrcmJ0Z3QbC0tSQlRFU1QuQ09NMBIG
+A1UdJQQLMAkGBysGAQUCAwUwDQYJKoZIhvcNAQELBQADggEBACoRg0+LnZehgdfM
+xy/zTXj3kH30W++NTErQAOEEOm8KscaWIF/GXNDX9G+C4tvT/LN3vHCd+hnGgvTr
+kkJlyYtLZZgkv7sa1PQW3yozhjOPRzdjiXitV6RsE4ujzwbcr3Zd0twZnf7nDbIt
+HmgjQJF5EMUprgPc1M3xdRVvi5FP/rvoUV03eI5/EmyvJ2046XfTD45pQgJdCWnO
++KsFpaUIH6u4neWU4UdBxAsgo0/20pDYNM8GgPXY76wRi9yZ1Fgg2gJTS7QMpgyp
+ux0vuwbq3iuo4VFMhNyGmR2NeCF7OGUPSmjD/pCck9Vzk7Q7ainv58PHAyXIhM0E
+C+aVsEk=
 -----END CERTIFICATE-----
diff --git a/src/tests/dejagnu/pkinit-certs/make-certs.sh b/src/tests/dejagnu/pkinit-certs/make-certs.sh
index 387311aed0..8aa71a975e 100755
--- a/src/tests/dejagnu/pkinit-certs/make-certs.sh
+++ b/src/tests/dejagnu/pkinit-certs/make-certs.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
 NAMETYPE=1
+KRBTGT_NAMETYPE=2
 KEYSIZE=2048
 DAYS=4000
 REALM=KRBTEST.COM
@@ -54,7 +55,7 @@ basicConstraints = critical,CA:TRUE
 1.component=GeneralString:$REALM
 
 [princ_kdc]
-nametype=EXPLICIT:0,INTEGER:$NAMETYPE
+nametype=EXPLICIT:0,INTEGER:$KRBTGT_NAMETYPE
 components=EXPLICIT:1,SEQUENCE:components_kdc
 
 [krb5princ_kdc]
diff --git a/src/tests/dejagnu/pkinit-certs/privkey-enc.pem b/src/tests/dejagnu/pkinit-certs/privkey-enc.pem
index ee35e5cdcf..81e05d31aa 100644
--- a/src/tests/dejagnu/pkinit-certs/privkey-enc.pem
+++ b/src/tests/dejagnu/pkinit-certs/privkey-enc.pem
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,7DF54DB740F92845
+DEK-Info: DES-EDE3-CBC,9F0F79BAC91A7D02
 
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/src/tests/dejagnu/pkinit-certs/privkey.pem b/src/tests/dejagnu/pkinit-certs/privkey.pem
index 548e5a8d52..48f0ae989f 100644
--- a/src/tests/dejagnu/pkinit-certs/privkey.pem
+++ b/src/tests/dejagnu/pkinit-certs/privkey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/src/tests/dejagnu/pkinit-certs/user-enc.p12 b/src/tests/dejagnu/pkinit-certs/user-enc.p12
index b2648ceaa04be6a560966a414a7bbc8ac022c20e..39e9d31b065b342d637ae053dbf18af0d0e10183 100644
GIT binary patch
delta 2706
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
ML!k>OH39+%00ILlc>n+a

delta 2706
zc-jGy3T^e37L^u|U4IAu_0R=Q$07m(2mpYB1u!tho?ixcuO0j=`>lGTs)`UgGm<_)
z<FRqmWn%pS)IcQqE4xmjt^GWpkjN3ilU?#<{lsF^SOD<gXN+Nnn&oDodfIZcOm95&
zxqOL=2<PpBiz1xlP2w^J?hU#tjG(#fYuRK)$hH|CSktq&rGM>pKPe)yNdVeYJWc`4
zF|P^R?oh5stR*_(MT+TZR4{&W9qoqi)f&pBxOiQbYZZ1lmQ#Pc4q?TD!0ns{qlu}U
zz(Odv2K+dfougnpE_VouJ0!M7bt6;%w@&*9{%SfiDrvUdRZW6CSckeD^E--2MzmZD
zliS3w_y8kT@PFwptW_3@*xAKJ7u%{U_HfDf9jg*K{X<$ZK~Z=^`bq{K)M1SMGVQ^?
zv#j3vs0HG{<v$_fwY45d{sUgr3KaH!i5o@ZAMdT*w&mxF{Bd#6rGd;cFHuuC4QyuU
zWtK?T7HAci4IWSwBKqRZwD3!ugQY3y5-k`)`IBm*@PD&ZGo`zmy-UI%qVb9igw;ag
zu4B_@oyd4J7|V#YG43Y+vphe4A#je-(nTPkFo#R}taq_<^zK?vpm!XU`1Zp+!#lbp
zG%{BWDc<5rMW=rcNP_6N7a%mAel7zGbB`-%;P^1!*=KlsIsd0X<pM*pwtHLDlro<b
ze=s6MIDeG9)y*e15CDpUpMUn0Y)uJtr$>g~oN&R6F<awHk=!m#yDWlWY*|xM^~y!w
zP?NA5+*91PhZbIr?zRQ>PVPVchC^z{P@wq`t};KFoH0iPJC$e?G@1S`jv>DCV8RB0
zmIsXlD|}<<BT(;Y4o7mvNXIChmBSuu`mA;5dVfJn@D&$8mxu!CY&vd%Yc63nwX|?Z
zW~9`V$iKUJy5eAfF0@Ib<d1V=>)cCDUm$lZ#mt_Z{Bv{YU=x+<ZS-0J{J!ZZQ(GK7
z|1OjcR@xi#na~>YDXTvPmRZqmcS<j*C!aHkp8o-gk;)F1tJd};GD$jhMd$jX4!5ul
z`F}C|j}0uLhv2;q=pmiBZlALqVXC8E#FvvJCOpB<bNI@9?`RbDw%hQ0)QL&Arg;v)
zW%kK_{9q)7B|wZw*cGeYcY~GoEHFO>#sZMLcxp_X>UsXy*q9%5!2Sahq`0+O!z?}T
zi$jc*@c*4b82s)hz9gxO-sN=XmM&gwlz*+BOwds}(8bcfnOwG9>c4M41I>BdyIE6(
zXbn>T;bsx#*{293>WqA>Y^T8DHfefzJaoF~ZIQJHExS&`Tva3s7=r%MBNe?|IHadr
z<bYYwdzS90PBZb$HW->3;)tG~fkk%kK$~?KlYIw23fnj%9teHJ@ZW*2W?&0_g?~!F
zv4KH{ocV+%s=kSCbfuiTU@S3?HSk;9`=V>fXAVPQ5yJ-A3VGtMn$hyJjBL>)Xat*f
zk>LDwCgwH<7MZbk%enw@_RMCIr@ki6QHeb<ZSI2Tg_@M_F#R~{fk%G*ru^hD)YFXn
zog`24=6ZBt|My*tX%=$=_ORincz=V>;WK_J`RwaC8Mfd`O!Ox)RKq~fUu_iU>d?3o
z{a5i;hDvlYB>6O@o?_&bd+Lyi(>Q~@du=M6Hgdv6`ogLgF)<s{P=?1wq^3R3oyfZO
zbU&yzwLS?ml6xI2>jrfhJv2PHS&O?EAOq?#SMnKNcb&pBwlq5g^OegV?n;MEw^ee;
zNAm2zd3N1vCWnEDkE2q@f3WB!pgs=2pUxlBhb1$h(bH{Eh$P!rF3CGZuuACYydD<L
zW-1_YK;I*vlg7MZ@YgjGlbr=de@mz0j%31q%>n`l00e>r$h%Gmj<@&l(&Xw}Eidkz
zz@_D66&yL_Rt&B;1I)=kuf6ANgrS(5a+rcm&O0Um(1W@-qtpcTe1y@SR`1y2+!Bjk
zQw=o(lgh9Kq4o>zszLR*B2s9LY?-=8`IIV7);U#dMhstBw7oiDXdQhCe+i9pk0cnV
zMlgF0u95BdPI`jmlfO~!!}altl{kMJXBOyAE&JL=v<&Va3rMzRzEl_6c~VY?np>Zo
zc?iAu&Mt}Dt}KDnI_!(wF&W;btDeR~!+4GFOI$qsL2rSj&Nf1Z`%l4{qYJ4Qo$_}#
zJwxm6gK(!^XH`H3GDvYMf6ZXiHexfG^(D-Fhn88u;X368WggB2*>Np*Ni+Go9sUe9
z{=o5{uwK>`NVcYMf4tOHNIsnqr!Hx^gA~eWZks4J^1j{2p{HG?g<?E~o6sHc!S~?s
zB+QE!wBL$pgL~a2`Gd}kZ`%uT`8xyOlaRtci4z_LBw0;Cy7Ixqf2yGApSm9WGwVIJ
zi?Uc7g_YO=6jlc7e*H748fFE(QJ*Y5Urg^XW-BvgmVe`wf%ezDyc~gX^?HDT6-}`6
zU~C(o@sYuqEBql@`e*W4>@>qFF8lS7+k^J`&{T!%j#_zl8OmX0^a|L_Hb^Bf&;C%^
zDRf4UJIncVpMKi6e_p<H-YD`KcD>tRh8&L~a0c+OZyUh4xk_H*ZiVT9oPj~^=?cH{
zvVq3YVa|#w$>d?3-K=B$mSiz|5L=0aU%z0r5=NXvy%;*bv}`8zSe%or`$-|90;plD
zBMc35ZSO>Cs2V+WJaJ0#L+Y2{w9jWYmI~V$Xh0U}91I|Pf1})&1-$>cf4IK3av<t$
zEFr$Z|IWHRHIHp=dKp<UZ=^0juJ@1V=q?z7cscNH6)ebp!&3X?FSvs`0>bmhiO_QH
zUzb|*rY0bBQH(2Dz0^m5V`6s!4}lu+2Z4sL!Z;_w`zlgnxe2p>);eKXeRgPbE8hM)
zh`oOs<_8p$e;6ws?`vcLw-*IKpOB*Ser86?AiRqkbxtkcVjVI7;D@#G#Zz{htm%|t
z{IL@z9azcPs?vP_JN_heR0Dg%Z|rV#jIu&Cz<+D|zX&(+Uz{)Hp2UasosM?7e~B}}
z@Uc>9Lbj7eqH5pI{>XB6W3)`4gbWgDP6bb^t$0U;e~hQjWsuc=W%5osyn#COy+0Wn
zfXyb`UV#nIfFOyKcTxpXT4y|ytF%_1G!x9h^LdFL>`qCd-xJuFe=Cka?oHZzMvv?F
z4Tv$#KpEY*>=SF~eJrHN-&}^_T`nbeQ#*zvBRah$g$#AJtiay_Dr(%Vf`f5yT3Wx4
zPw9EGe{U+zCREP#EnqfSUY`b6m<cNYbVnYiGk^ZgQ|{(}5{>lSFbnd$rpIUC2?Bx*
z&*ahaHlnLZq_)8PFZU&7S##TPwtTI){S}rL@XarlH4%tMe*>vZ$pfl61)r>6REt#6
zA1Tmhn;*&xXn8IimR;1v;fwKcbLt}hCu@0Ke_$`LZOuZ5IpYkzdoDeo7LH_jdX(6n
zI8<+LlcXr9=#AM@2Sx-NbWd|hrC&4HEsn(_cD0F-dOu17hU<54gBG6YK=4`U_l4`A
zqM(8cTN||R5H++bkzne?q5MIh^^GwlFe3&DDuzgg_YDCF6)_eB6ccK}Vdj_r1JjB8
zJcW?bd-abN6XY;4Fd;Ar1_dh)0|FWa00b00NU*E?J0(4Y+o=|f0;Fia+%K{O2)&NJ
M-JAb8(*gnr07yzcC;$Ke

diff --git a/src/tests/dejagnu/pkinit-certs/user-upn.p12 b/src/tests/dejagnu/pkinit-certs/user-upn.p12
index 6daa5b378b83e9d4134ae48f8d1ebef715bf6cf5..df931d71e3ae38b40473025c2a804d3fa9c5ae8c 100644
GIT binary patch
delta 2698
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
E06bPGyZ`_I

delta 2698
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
E0Gb6l-2eap

diff --git a/src/tests/dejagnu/pkinit-certs/user-upn.pem b/src/tests/dejagnu/pkinit-certs/user-upn.pem
index 21960ea6e2..37fcab8d77 100644
--- a/src/tests/dejagnu/pkinit-certs/user-upn.pem
+++ b/src/tests/dejagnu/pkinit-certs/user-upn.pem
@@ -3,26 +3,26 @@ MIIExTCCA62gAwIBAgIBBDANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
 FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
 A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
 dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
-b3RoZXJ3aXNlMB4XDTE3MDgyNTE4MzIxMVoXDTI4MDgwNzE4MzIxMVowSjELMAkG
+b3RoZXJ3aXNlMB4XDTE5MDIxODAwMjU1NVoXDTMwMDEzMTAwMjU1NVowSjELMAkG
 A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
 U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvwcVP/5SJr9NxIUgkl3tntkW8w5guESQLKpGFbWCAOnTGsgCiH9/LGri
-oh1Lx/sC6t/f2TPJL020MPaycrB+gtpmm6chc0sK6OuWup2Eqxl22XxpguaMiFMu
-7ius3lZkhFBQtuQuK6pzpkU6M5nGRHQ2QL8LJ9BMk7lrZNoyvB4uzCZjSTkqUCh6
-+myH4s9ewsLrqyqBi5YMPxzVn0aUjx1bZptE+35ZQqyQSAepgmsKSO88hmBLtQMD
-OlQ4JeikMOv+pD12cBjO33yv+kLHrbX/ZHgm21lt2xdANtBoeFXr2ImoAKpkHSUv
-Io4prhjZTnPLf763ql3egaVYKv3oPQIDAQABo4IBVjCCAVIwHQYDVR0OBBYEFK8S
-4FdU0q0iiYKQtzGmwqn0CD2rMIHUBgNVHSMEgcwwgcmAFK8S4FdU0q0iiYKQtzGm
-wqn0CD2roYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+CgKCAQEAvq6eZ7Cigf5dH22+PlW3AP65TJ35ggGx5aNBl+Xjjup2Y1qHe2o/pUIE
+avg3d9hmus8ovsJEuWxsXyo/navpScSNUbBW5ig2jgSmzQOA1Lv5dzG+JgF71EI8
+kfe3/Y+1js2udpbsD+HjvU3QgZOPDO514gGLEt8UpyfymvBBz7ohDpPPdGD/hcJM
+XEiSNvLhVbIoENY6l5reA8z129Hs+JWycJ8ImUUH72bt6cP348WuJ7RQzt7NrBnn
+XiPGjWW5l9ewUkOkHpmLeIADyA3NUAXYI40whJkOUPhtMW2PnzM9CYKFpCVh4SKx
+71iB9KO5Y4sLHs9neXQncmhtr6lzEQIDAQABo4IBVjCCAVIwHQYDVR0OBBYEFGxN
+/r1v8njf7axXLec5+PyebI4WMIHUBgNVHSMEgcwwgcmAFGxN/r1v8njf7axXLec5
++PyebI4WoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
 ZXR0czESMBAGA1UEBwwJQ2FtYnJpZGdlMQwwCgYDVQQKDANNSVQxKTAnBgNVBAsM
 IEluc2VjdXJlIFBLSU5JVCBLZXJiZXJvcyB0ZXN0IENBMTMwMQYDVQQDDCpwa2lu
 aXQgdGVzdCBzdWl0ZSBDQTsgZG8gbm90IHVzZSBvdGhlcndpc2WCAQEwCwYDVR0P
 BAQDAgPoMAwGA1UdEwEB/wQCMAAwKwYDVR0RBCQwIqAgBgorBgEEAYI3FAIDoBIM
 EHVzZXJAa3JidGVzdC5jb20wEgYDVR0lBAswCQYHKwYBBQIDBDANBgkqhkiG9w0B
-AQsFAAOCAQEAceeR7lFXkEEjcMGK/mvNOT5zXcq27ipYuV5HBgGGNLqiawc7NTxF
-ocyZf9HujNOMvBNblTml2GJQ9wmyQesVTGgJFTGORS2sFizICq19jISxrv44cdeF
-X/KQxNmnviClkL9jfA/6oKU0uSpvUAUet3MmDuo8O7ebVXVEmQdvLrhP9ycHGq8u
-qG+5qjN4dpf/ejtCCMGGZdUdPxPosoXJzf17hpyt8/YQohKG2igLSy1O68tuHTXb
-L4yiB52JQdnJfOU1a+vUSk425zMI00MU1aLcDxcjI64kxYBpWflDqn9Ky0N6vA1i
-OoBZgRFeQSELxUp7SUsK4xO2gPM2w0zzvQ==
+AQsFAAOCAQEAeZXuyTRD2XQEcUoOYRXn6V1Glh61eHJ4e5ggp0QmTZoij8Y5YdmV
+jt4N8PE1wdXr0f7+a49Zh+YrKt7NZw4HlevYSMIyHVEeLe05zTFYL0w9R1P+16pf
+iSLmmwXZXBPX0biQq2wklD71GBFh/FF02uuetA/iPLMXvgfEUnbjVCcLpTc2/ISg
+tkGvWXtE06YXwSn3ANbCQPLifUKW2PZ8jGBOLLvslebvvJruWyfFLolkNsyA+ljr
+GvWZMxKTOD3LECHvLWFfl7xJsUNqL5qptz0baxeCrmaAdQdHvs4DApxebh1BZGn8
+KFV4g+N0Qz28tO0GSEA3cd2JHVz+wWQp7Q==
 -----END CERTIFICATE-----
diff --git a/src/tests/dejagnu/pkinit-certs/user-upn2.p12 b/src/tests/dejagnu/pkinit-certs/user-upn2.p12
index 8f4c6b2d05d14b7d5fd4f161fe8c34d065c2e5e6..e11860e6846f770b4c481bbe91fe358c835a0bdb 100644
GIT binary patch
delta 2682
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

delta 2682
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

diff --git a/src/tests/dejagnu/pkinit-certs/user-upn2.pem b/src/tests/dejagnu/pkinit-certs/user-upn2.pem
index 37e123adec..66d6b3e3b2 100644
--- a/src/tests/dejagnu/pkinit-certs/user-upn2.pem
+++ b/src/tests/dejagnu/pkinit-certs/user-upn2.pem
@@ -3,26 +3,26 @@ MIIEuTCCA6GgAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
 FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
 A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
 dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
-b3RoZXJ3aXNlMB4XDTE3MDgyNTE4MzIxMVoXDTI4MDgwNzE4MzIxMVowSjELMAkG
+b3RoZXJ3aXNlMB4XDTE5MDIxODAwMjU1NVoXDTMwMDEzMTAwMjU1NVowSjELMAkG
 A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
 U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvwcVP/5SJr9NxIUgkl3tntkW8w5guESQLKpGFbWCAOnTGsgCiH9/LGri
-oh1Lx/sC6t/f2TPJL020MPaycrB+gtpmm6chc0sK6OuWup2Eqxl22XxpguaMiFMu
-7ius3lZkhFBQtuQuK6pzpkU6M5nGRHQ2QL8LJ9BMk7lrZNoyvB4uzCZjSTkqUCh6
-+myH4s9ewsLrqyqBi5YMPxzVn0aUjx1bZptE+35ZQqyQSAepgmsKSO88hmBLtQMD
-OlQ4JeikMOv+pD12cBjO33yv+kLHrbX/ZHgm21lt2xdANtBoeFXr2ImoAKpkHSUv
-Io4prhjZTnPLf763ql3egaVYKv3oPQIDAQABo4IBSjCCAUYwHQYDVR0OBBYEFK8S
-4FdU0q0iiYKQtzGmwqn0CD2rMIHUBgNVHSMEgcwwgcmAFK8S4FdU0q0iiYKQtzGm
-wqn0CD2roYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+CgKCAQEAvq6eZ7Cigf5dH22+PlW3AP65TJ35ggGx5aNBl+Xjjup2Y1qHe2o/pUIE
+avg3d9hmus8ovsJEuWxsXyo/navpScSNUbBW5ig2jgSmzQOA1Lv5dzG+JgF71EI8
+kfe3/Y+1js2udpbsD+HjvU3QgZOPDO514gGLEt8UpyfymvBBz7ohDpPPdGD/hcJM
+XEiSNvLhVbIoENY6l5reA8z129Hs+JWycJ8ImUUH72bt6cP348WuJ7RQzt7NrBnn
+XiPGjWW5l9ewUkOkHpmLeIADyA3NUAXYI40whJkOUPhtMW2PnzM9CYKFpCVh4SKx
+71iB9KO5Y4sLHs9neXQncmhtr6lzEQIDAQABo4IBSjCCAUYwHQYDVR0OBBYEFGxN
+/r1v8njf7axXLec5+PyebI4WMIHUBgNVHSMEgcwwgcmAFGxN/r1v8njf7axXLec5
++PyebI4WoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
 ZXR0czESMBAGA1UEBwwJQ2FtYnJpZGdlMQwwCgYDVQQKDANNSVQxKTAnBgNVBAsM
 IEluc2VjdXJlIFBLSU5JVCBLZXJiZXJvcyB0ZXN0IENBMTMwMQYDVQQDDCpwa2lu
 aXQgdGVzdCBzdWl0ZSBDQTsgZG8gbm90IHVzZSBvdGhlcndpc2WCAQEwCwYDVR0P
 BAQDAgPoMAwGA1UdEwEB/wQCMAAwHwYDVR0RBBgwFqAUBgorBgEEAYI3FAIDoAYM
-BHVzZXIwEgYDVR0lBAswCQYHKwYBBQIDBDANBgkqhkiG9w0BAQsFAAOCAQEAkYoU
-bTCe61BRrB1yw8mIpnXlRrVLV91M8YEr07Jzk4qGfRLXbWf9BnMpxzbU4YVzEifh
-w6+gYSWGjgq4kDmp6tcY3IDGvzXkglKMAZv2mpFnBa6ZooEQ96tgg9O9G5Lg8Sv0
-kSkoySJq03xapucEZbhPrtGNHKwB/EDo3T0Iaby+Go9bqkObNfuIFXRXC6HqPBS4
-khss6cJ+daEE3Yg21QZ1BUlncwYbkCzt+xp3YaHlY41gdaMdF0tn6iRJjANAM2Kg
-6J45M4GKKT3yo5hJAWIS4lSCZX92g/uiT7BcBhE+vDzi3JuEc1QKajgnza1BMZMG
-EEIPWkC+Lfg8scWS5g==
+BHVzZXIwEgYDVR0lBAswCQYHKwYBBQIDBDANBgkqhkiG9w0BAQsFAAOCAQEAWf0/
+d0284FjoywSaPpXvy4sJ3N+Ts1bXmM9NtJT+pKDpyMEisNFQ/kqO2UURT+9dZP5o
+yzMttuNdi0lJ4W8gXE5CeMDJv1z9HUXl6blDOh7YYdqM9Y6rBIKwZHyFZzSlgGIQ
+KHfDbj2dmOJLVPfLZM+MA42G1nmfQPGUMcc4mLp8Xu8x7LXCxJBuXV/gxSEMbLrm
+YNj/mXQJhQwYIZdeBZIBUcdU2rD2bMbHcWAs183ddEg3+CSN8fdppsFT1ZX4ZlPk
+XGSrv9EYC4GLZpLOtB3FwUQ1TmEDMJqzifY8jcS03UdQ0gKZBm83rVMnXvU01CgA
+MI9PN0lFwPEutERN0g==
 -----END CERTIFICATE-----
diff --git a/src/tests/dejagnu/pkinit-certs/user-upn3.p12 b/src/tests/dejagnu/pkinit-certs/user-upn3.p12
index da888f519d9112e3d15dc48ad38585cde98d5b47..dae25f8636043e8ba39a53e0385bcee7db23174b 100644
GIT binary patch
delta 2698
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
E0Q77lIRF3v

delta 2698
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
E0EqGn4gdfE

diff --git a/src/tests/dejagnu/pkinit-certs/user-upn3.pem b/src/tests/dejagnu/pkinit-certs/user-upn3.pem
index 754114f5da..d39b879b4b 100644
--- a/src/tests/dejagnu/pkinit-certs/user-upn3.pem
+++ b/src/tests/dejagnu/pkinit-certs/user-upn3.pem
@@ -3,26 +3,26 @@ MIIExTCCA62gAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
 FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
 A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
 dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
-b3RoZXJ3aXNlMB4XDTE3MDgyNTE4MzIxMVoXDTI4MDgwNzE4MzIxMVowSjELMAkG
+b3RoZXJ3aXNlMB4XDTE5MDIxODAwMjU1NVoXDTMwMDEzMTAwMjU1NVowSjELMAkG
 A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
 U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvwcVP/5SJr9NxIUgkl3tntkW8w5guESQLKpGFbWCAOnTGsgCiH9/LGri
-oh1Lx/sC6t/f2TPJL020MPaycrB+gtpmm6chc0sK6OuWup2Eqxl22XxpguaMiFMu
-7ius3lZkhFBQtuQuK6pzpkU6M5nGRHQ2QL8LJ9BMk7lrZNoyvB4uzCZjSTkqUCh6
-+myH4s9ewsLrqyqBi5YMPxzVn0aUjx1bZptE+35ZQqyQSAepgmsKSO88hmBLtQMD
-OlQ4JeikMOv+pD12cBjO33yv+kLHrbX/ZHgm21lt2xdANtBoeFXr2ImoAKpkHSUv
-Io4prhjZTnPLf763ql3egaVYKv3oPQIDAQABo4IBVjCCAVIwHQYDVR0OBBYEFK8S
-4FdU0q0iiYKQtzGmwqn0CD2rMIHUBgNVHSMEgcwwgcmAFK8S4FdU0q0iiYKQtzGm
-wqn0CD2roYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+CgKCAQEAvq6eZ7Cigf5dH22+PlW3AP65TJ35ggGx5aNBl+Xjjup2Y1qHe2o/pUIE
+avg3d9hmus8ovsJEuWxsXyo/navpScSNUbBW5ig2jgSmzQOA1Lv5dzG+JgF71EI8
+kfe3/Y+1js2udpbsD+HjvU3QgZOPDO514gGLEt8UpyfymvBBz7ohDpPPdGD/hcJM
+XEiSNvLhVbIoENY6l5reA8z129Hs+JWycJ8ImUUH72bt6cP348WuJ7RQzt7NrBnn
+XiPGjWW5l9ewUkOkHpmLeIADyA3NUAXYI40whJkOUPhtMW2PnzM9CYKFpCVh4SKx
+71iB9KO5Y4sLHs9neXQncmhtr6lzEQIDAQABo4IBVjCCAVIwHQYDVR0OBBYEFGxN
+/r1v8njf7axXLec5+PyebI4WMIHUBgNVHSMEgcwwgcmAFGxN/r1v8njf7axXLec5
++PyebI4WoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
 ZXR0czESMBAGA1UEBwwJQ2FtYnJpZGdlMQwwCgYDVQQKDANNSVQxKTAnBgNVBAsM
 IEluc2VjdXJlIFBLSU5JVCBLZXJiZXJvcyB0ZXN0IENBMTMwMQYDVQQDDCpwa2lu
 aXQgdGVzdCBzdWl0ZSBDQTsgZG8gbm90IHVzZSBvdGhlcndpc2WCAQEwCwYDVR0P
 BAQDAgPoMAwGA1UdEwEB/wQCMAAwKwYDVR0RBCQwIqAgBgorBgEEAYI3FAIDoBIM
 EHVzZXJAS1JCVEVTVC5DT00wEgYDVR0lBAswCQYHKwYBBQIDBDANBgkqhkiG9w0B
-AQsFAAOCAQEAurL26+vQNYFbJNAFJ3yHOt1nwAVO4/OlCtgqzOAq0nBs35HY10Qe
-y8eRcxrLmm4O/Wy+Rwre2v3pIP0AclvIytDzEm6K3Pgj4yJfUUM3VhnSOlXQP6UG
-D9Z9pVxNiDeykj5/SzxwOQAmJbPcMx9aRwP9wOLMwUxi5sKHQlL9YUTC1hffhuYY
-Yccc2dHWd5IyaKaLp9yBVXQryNdVTBYrGA2ZqcwETmcXqU/wCo/Rmf10Ra1sj88X
-VfTb4Sr0j9RaSKeXRZgbEu6kz9i2WK70dcDke08xRv4xVfrlbXrfIS+Va9WYKxrf
-Xb0XCkKp32Q0EHqapeJrCcuQtnDMGvncTQ==
+AQsFAAOCAQEAF/V+Cx49jH70LMI7S7SGDFWr6/rtYwjJax7RgZN6JZlakd1R6GHa
+JHwUMmf67V/R3qVWfThhbKjxumEY+whxiszegDwBZC+fFiYbaQMCIchHkx8vkdmK
+ZJ9VznDiA/kp0Ty8JZKG6TMRkkxUo+csEXU4E6TZFZaz9pfPrhxHU21uPbeDeE3h
+sUiUqH7oZBjmSS+2OmAu0v4+/Ex0QkqJACvZYNA5zFpgV0Ux/26EQt/bKiYkXYZq
+CIWP7cd/MRfNqeqlbUVpKcIkk5WPpuqPVffA+f2B1Al5iJ8o1pzqN+awZBLLZv3F
+p1+AeVD5nvWpyHSXmst32OYPPTBL9Yk3uA==
 -----END CERTIFICATE-----
diff --git a/src/tests/dejagnu/pkinit-certs/user.p12 b/src/tests/dejagnu/pkinit-certs/user.p12
index e9c044c5b1d0d950ee2520770de2f8f64200cbf6..97993c07313a15ef2615e4480c76f9f34dd253de 100644
GIT binary patch
delta 2706
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
M54m6^vjPGL01J#A6aWAK

delta 2706
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
MPj+1S(*gnr0E_P~i~s-t

diff --git a/src/tests/dejagnu/pkinit-certs/user.pem b/src/tests/dejagnu/pkinit-certs/user.pem
index 5b2853bc83..ab24e99d24 100644
--- a/src/tests/dejagnu/pkinit-certs/user.pem
+++ b/src/tests/dejagnu/pkinit-certs/user.pem
@@ -3,26 +3,26 @@ MIIE0zCCA7ugAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
 FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
 A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
 dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
-b3RoZXJ3aXNlMB4XDTE3MDgyNTE4MzIxMVoXDTI4MDgwNzE4MzIxMVowSjELMAkG
+b3RoZXJ3aXNlMB4XDTE5MDIxODAwMjU1NVoXDTMwMDEzMTAwMjU1NVowSjELMAkG
 A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
 U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvwcVP/5SJr9NxIUgkl3tntkW8w5guESQLKpGFbWCAOnTGsgCiH9/LGri
-oh1Lx/sC6t/f2TPJL020MPaycrB+gtpmm6chc0sK6OuWup2Eqxl22XxpguaMiFMu
-7ius3lZkhFBQtuQuK6pzpkU6M5nGRHQ2QL8LJ9BMk7lrZNoyvB4uzCZjSTkqUCh6
-+myH4s9ewsLrqyqBi5YMPxzVn0aUjx1bZptE+35ZQqyQSAepgmsKSO88hmBLtQMD
-OlQ4JeikMOv+pD12cBjO33yv+kLHrbX/ZHgm21lt2xdANtBoeFXr2ImoAKpkHSUv
-Io4prhjZTnPLf763ql3egaVYKv3oPQIDAQABo4IBZDCCAWAwHQYDVR0OBBYEFK8S
-4FdU0q0iiYKQtzGmwqn0CD2rMIHUBgNVHSMEgcwwgcmAFK8S4FdU0q0iiYKQtzGm
-wqn0CD2roYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+CgKCAQEAvq6eZ7Cigf5dH22+PlW3AP65TJ35ggGx5aNBl+Xjjup2Y1qHe2o/pUIE
+avg3d9hmus8ovsJEuWxsXyo/navpScSNUbBW5ig2jgSmzQOA1Lv5dzG+JgF71EI8
+kfe3/Y+1js2udpbsD+HjvU3QgZOPDO514gGLEt8UpyfymvBBz7ohDpPPdGD/hcJM
+XEiSNvLhVbIoENY6l5reA8z129Hs+JWycJ8ImUUH72bt6cP348WuJ7RQzt7NrBnn
+XiPGjWW5l9ewUkOkHpmLeIADyA3NUAXYI40whJkOUPhtMW2PnzM9CYKFpCVh4SKx
+71iB9KO5Y4sLHs9neXQncmhtr6lzEQIDAQABo4IBZDCCAWAwHQYDVR0OBBYEFGxN
+/r1v8njf7axXLec5+PyebI4WMIHUBgNVHSMEgcwwgcmAFGxN/r1v8njf7axXLec5
++PyebI4WoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
 ZXR0czESMBAGA1UEBwwJQ2FtYnJpZGdlMQwwCgYDVQQKDANNSVQxKTAnBgNVBAsM
 IEluc2VjdXJlIFBLSU5JVCBLZXJiZXJvcyB0ZXN0IENBMTMwMQYDVQQDDCpwa2lu
 aXQgdGVzdCBzdWl0ZSBDQTsgZG8gbm90IHVzZSBvdGhlcndpc2WCAQEwCwYDVR0P
 BAQDAgPoMAwGA1UdEwEB/wQCMAAwOQYDVR0RBDIwMKAuBgYrBgEFAgKgJDAioA0b
 C0tSQlRFU1QuQ09NoREwD6ADAgEBoQgwBhsEdXNlcjASBgNVHSUECzAJBgcrBgEF
-AgMEMA0GCSqGSIb3DQEBCwUAA4IBAQClwfj6ACfmDie1YoKzr3zSWZJKZimv7wG1
-iZMNPE6bw22ZmE+P+Vq6WrY5M5e4u7ZdvFmkVq3rUA0HoU6bk3YLGapgsEAG6W1R
-LVzxwoYDf4poOMqjCL34eLFdlVeRDADiulROE8bJGrPLJIiqeii0c7Kzxxuh5nxl
-QHDgNV0fHQQJlejgJssOqgGErsCXCq7k6kkqB8MnKVMErRjsYuY3YI2tpjxBq9nA
-A9dXgIU1zEUVzfpxzBjL9+2pMctbL1y4/ePpTP1+PlfI81TwrQNvMGYjxKNZM1ab
-lZt37n8GQUZQyZ2TacR4JyY+w20ivE/JPN0L3Ncmem6bO1CULpwO
+AgMEMA0GCSqGSIb3DQEBCwUAA4IBAQAOBmEbWERHmV5YfMrOIY36mevch2KJokw9
+LXZqnKI4oezajEMwx0Wv+M/Gb4ZuYrfobiHSvfzCPUXyyRVWPr8sFBvDXnoBSlos
+g+Y2O8+toyJ8u8gn63SrnPOHCdYkClkDeHI3EzuIcLfgn+Uyg9lkQOjBBNj5O42K
+GoTNCuhoB6IAa66JD2u7E7pfBnceSUYP1DTlCK9l+1C+zOAEuG2N8K4n0ZRZbVqd
+2euMypjorJwgebOzlk86TNzOb5IP8G6phs7D4tvhe7J6mfJ3tFmGbH8V7jY51iCT
+EFQgm39U4J+2uQ0LlEsE3v7wXGW3MLUBY6STcGPwkBrxcmsdKNmy
 -----END CERTIFICATE-----
-- 
2.47.2