From ce4e370f1717972fef92ae6d749107ebd11b65bc Mon Sep 17 00:00:00 2001
From: Greg Hudson <ghudson@mit.edu>
Date: Fri, 8 Oct 2021 17:44:15 -0400
Subject: [PATCH] Make test PKINIT certs work with OpenSSL 3.0

Add shell functions to reduce repetition in make-certs.sh.  Create
PKCS12 files with the -descert flag so that they can be read by
OpenSSL 3.0 without enabling the legacy provider.
---
 src/tests/pkinit-certs/ca.pem          |  32 ++++-----
 src/tests/pkinit-certs/generic.p12     | Bin 2477 -> 2469 bytes
 src/tests/pkinit-certs/generic.pem     |  38 +++++------
 src/tests/pkinit-certs/kdc.pem         |  32 ++++-----
 src/tests/pkinit-certs/make-certs.sh   |  87 ++++++++++++-------------
 src/tests/pkinit-certs/privkey-enc.pem |  52 +++++++--------
 src/tests/pkinit-certs/privkey.pem     |  50 +++++++-------
 src/tests/pkinit-certs/user-enc.p12    | Bin 2837 -> 2829 bytes
 src/tests/pkinit-certs/user-upn.p12    | Bin 2829 -> 2821 bytes
 src/tests/pkinit-certs/user-upn.pem    |  30 ++++-----
 src/tests/pkinit-certs/user-upn2.p12   | Bin 2813 -> 2805 bytes
 src/tests/pkinit-certs/user-upn2.pem   |  32 ++++-----
 src/tests/pkinit-certs/user-upn3.p12   | Bin 2829 -> 2821 bytes
 src/tests/pkinit-certs/user-upn3.pem   |  30 ++++-----
 src/tests/pkinit-certs/user.p12        | Bin 2837 -> 2829 bytes
 src/tests/pkinit-certs/user.pem        |  30 ++++-----
 16 files changed, 204 insertions(+), 209 deletions(-)

diff --git a/src/tests/pkinit-certs/ca.pem b/src/tests/pkinit-certs/ca.pem
index 2d7ab9d0e9..63d31c1f5f 100644
--- a/src/tests/pkinit-certs/ca.pem
+++ b/src/tests/pkinit-certs/ca.pem
@@ -3,27 +3,27 @@ MIIE5TCCA82gAwIBAgIBATANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
 FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
 A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
 dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
-b3RoZXJ3aXNlMB4XDTE5MDIxODAwMjU1NVoXDTMwMDEzMTAwMjU1NVowgacxCzAJ
+b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMFoXDTMyMDkyMDIxMTEzMFowgacxCzAJ
 BgNVBAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRzMRIwEAYDVQQHDAlDYW1i
 cmlkZ2UxDDAKBgNVBAoMA01JVDEpMCcGA1UECwwgSW5zZWN1cmUgUEtJTklUIEtl
 cmJlcm9zIHRlc3QgQ0ExMzAxBgNVBAMMKnBraW5pdCB0ZXN0IHN1aXRlIENBOyBk
 byBub3QgdXNlIG90aGVyd2lzZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL6unmewooH+XR9tvj5VtwD+uUyd+YIBseWjQZfl447qdmNah3tqP6VCBGr4
-N3fYZrrPKL7CRLlsbF8qP52r6UnEjVGwVuYoNo4Eps0DgNS7+XcxviYBe9RCPJH3
-t/2PtY7NrnaW7A/h471N0IGTjwzudeIBixLfFKcn8prwQc+6IQ6Tz3Rg/4XCTFxI
-kjby4VWyKBDWOpea3gPM9dvR7PiVsnCfCJlFB+9m7enD9+PFrie0UM7ezawZ514j
-xo1luZfXsFJDpB6Zi3iAA8gNzVAF2CONMISZDlD4bTFtj58zPQmChaQlYeEise9Y
-gfSjuWOLCx7PZ3l0J3Joba+pcxECAwEAAaOCARgwggEUMB0GA1UdDgQWBBRsTf69
-b/J43+2sVy3nOfj8nmyOFjCB1AYDVR0jBIHMMIHJgBRsTf69b/J43+2sVy3nOfj8
-nmyOFqGBraSBqjCBpzELMAkGA1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0
+ggEBAM+lV5iaVats0yBFN4FBe6bovloNe3d0F9qMuhKqlECv6cFra75gSGmHJz6t
+GTK8zITU7sni429azTZC9IQnUt/2lW8dWzpZD1T5Vt1DYvYFqVzjhNfzeEDK88ig
+ENfzaX/cY2P76arJr0cewGaauzaux8heYW1CjBxWmk6kWq4aD+5jggchvBeOGEE2
+NkV3MPbXut8fu+3NzuuIG7Z0ilwQv+KUvQ8QQb9VCwdsDh/ERsQ4loC9P4jtuWCJ
+ikIE78GxDcOMoC1ftJtW/mBCS2iCHipXrp2BDDJMyHxZjHpl0VoDR7koWGtD3sos
+EwUkXVvWIuKs432h2dXQ+u8HaBsCAwEAAaOCARgwggEUMB0GA1UdDgQWBBT0F6X7
+1QRftDiSeNSY3bks3nK0IzCB1AYDVR0jBIHMMIHJgBT0F6X71QRftDiSeNSY3bks
+3nK0I6GBraSBqjCBpzELMAkGA1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0
 dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoGA1UECgwDTUlUMSkwJwYDVQQLDCBJ
 bnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVzdCBDQTEzMDEGA1UEAwwqcGtpbml0
 IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ugb3RoZXJ3aXNlggEBMAsGA1UdDwQE
-AwIB/jAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAGdouyTbxO
-bnyMr6hEDnMLRrSqwozfLGnfJIrUxvwtn/9UAlFuCpnfNi1xQkwimW8zXOHlCoAF
-fpeE7zpotmN6xbg2u98J9QOo7vGfoADvVgiZaDMq+Tv52ZG0OtbzTe/LyCXnjanM
-G+Rgjhbmy2HW1orghyDUa5Qy9ISv4d72yOKGVjK8xxItnf9i7tRARVqqJk5p81QD
-WOBc7FUZNj5jYw38YPHqmZtwlr1DhCNeXwVi5GpwPrYwFAaqGuTnspfkpcDA8wEm
-iVvs7Gy69C0zy4Yz2I9ZzsDjmTV8PyZdMaZIhhpBHjQmBm+Pol/q5BubjFeAsPSU
-/YaKjpqk1jNg
+AwIB/jAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBT2FJVPS+U
+0MXa1HUOETuUPrVff7VeIvyAPm9IgX1zNbCvktCc4d7ErNB3P5ng8aZz4MKqwzuX
+HVhUxbF7JKfyUI41lcixPG+k+U9mzBJaozWT+K1OhdUF//mGPxaxe5jyUhDiQArD
+/6vulX0/B+1iuIa1sCfoeelzqQcYHqhZdWn6bBdcDWNARHIXWs5zPeKA975+d5TW
+rofE7T8nNQJvcZoVjCSfcYXhP82D/0sA+wPCt3fgbBZdvJ89xwvIlzBtiwC++Zbe
+37Rt5av0+ykpR7nmh2jyG+ItzE73nYKdBrUI5J6JLSbUcQTw4jeXHwDULUHZ6fXg
+TBEM2v1VW4Df
 -----END CERTIFICATE-----
diff --git a/src/tests/pkinit-certs/generic.p12 b/src/tests/pkinit-certs/generic.p12
index 90de08f7290db45f9bee9c4220537f97e2ac20f5..35c27415bcb07c479990133882655bce3fe3bd72 100644
GIT binary patch
delta 2442
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
ICISKo06MahR{#J2

delta 2450
zc-jGy32pYJ6Ri^>FoFrG0s#Xsf(dU12`Yw2hW8Bt2LYgh319?*30yFO30RRLHh%^%
z4g?5wR8`FX$2*Mz0tf(rf&<8fNmeScm6p;z7wJX0{EfrUO+5qNue|Ak2wh?5#RlVe
zyPK)jb(lA%kU3#?QRSEE_1%61X(5--h+`T`-BloR=&e~;8c>vbLZfGZOwSR~>t*Cs
z4L1%ZM^Ygp?}tqV`Ylb^JHB!NN`L))xF8J>8{Tewf_hbO&r27@UR~7=Llo56hytn<
zv%S|bFYD;H880+(vvGs#gd@swqeN$zMgvqXLl@pO7Q(pZ?*@jvSdrPhHB9%CGW%j8
zWxAI!+s-+*djGw!2!iV^K3vd<yrP$x-?+hr6oha?lr(0XOZ^qL!|IKDl7GP+kx0eW
zmz7m36}5bcU=*yu<7BzIywt@DD|3<L#6;P~UWtzIUeLM0-m>hOBDSTE7|CSjBl1{0
zM0@gtinIEsnf{uUDN<lFf&DyXx2f`#do2h>&Tjxj?v{mmuwaj1Y~HAZypHKNMk&t1
z40Erc@=7`Oeq5XC;1-CJF@K~xZQW-p%ON&&)joUlk#B*E0xIH5yTZVB<FC3d!=?LP
zWaKAYc{VzN!W;~vYjR{E-L`j3Njr@D!1)(<kjuuHdAoiQzwKPMBL-Vyh^z>T=dKaM
zrW_yS8$5gT(p!M_^+sfSP7g{SVEN)SHprm69dkE)MtF7sw+HVY=zpcNU=ok_y<pUP
zX37Xp#Qg?D@F+6>4c?f=@Rp8YUck%WLXNlrRWFHCH_2-c&PK+EHbBKWdUjZWXhqw<
z|Gg$dPw8~$A$z$JKLB&623ND@lrlS?T9v>b8s)pm7@=S@EbNTrv>!0K!ot`nV&Kp`
z)Yi&)w9+^C*10>xzJK^n@sU$Ln6&9oqpDx1+ee>VESRd|mZ7-BJpIewBX!6HBP@ZV
zR$8qxf22TFXq;G6Jf9tz9wP}nz5G*X#N9R2=0|}W$-ej+<E}NZR$l*69OZ5rVH-vH
znL(+ka|kDoasYTXG9Q7*?(Wf?%ra`>PSB-01voMBnigBEiGMIC@Jjc$NYukoc5R2K
z7U4P51Ov^bl#PQ{H+zGn@JPxx`F@bG`6l5An_C&~>4Qre*DtLp%Ys0iWd5)1$op3d
z$>t)2bNrFeH>|@{4<t@U4xUM;VsujaDaW-F`oZs2jrQ8j<il>g6*$dE6hOG%&WK%K
zC7%=3FbZm?%ztE`Tguvpj!%P;Q6~rDEu;$jA4E6=4j>4?fUksC*(bZb>n1_fwl2DA
z7?x%dPCAm$ZLd|7PH6-9q1>5SR`PvVF*kW;hp4Z=9}V*{rX?!^GaDgeL?aeDSwrB&
zJ!zXwvcoWf1wjT0Duzgg_YDCD0ic2fG6aGJE--=xDt|D71ttayDuzgg_YDCI3IPJ3
zf&}g`f&}U?90m$1hDe6@4FL=R127H*2&7Q(xfz6|Bmx2m00e>r$l<P5Z6NgJ!)M5I
z-dO7VH++P{A2NljATL_16nbjBafYMHf&}KNjo`B2E3?d^$4wE5%+vjCFD!R))#}<$
zyq7Vf_<x#zj<r($L><O+{+NbgXsGf#7L}jW=Ak<|ji~6RD5<;(0W56bi~%aM3zo(v
z&1S_)`9n4l5D*Nkns^C?#$~LM5eTXmng;WrKe&%Ii4GE3n&t>niiin90Z-TYWzy!l
z&R^(W${8m#Qd1@HTFv2gu{||lP~2lPwMdI-OMg%!a?vg{V9?%A;#7lpvx7lK1&xF1
z>CMfGrY^u8<f%$G81kFo4mF`Th@ZyM$CG_JKT#QLO@akvh^FpHDlT_RMgQOpBGm#t
zh=5*>a%sMu4Xk@oGa+?9MRXR`kZUgN<(ePC)kV6Fni-&W4HWErab4$nyShHsW7JvN
z6n|)^)LTp-$8hPS&sY0^lc=T`-6ydWxgn|N0_qM`<vE^YrH`QkX(&q)et-p|G{~0A
z3w-OJ^_mrZ;QpTjjDg7d0klQ%Ww?`~6ZKLGpT`4P2^nLCs7a>&UC3Xn^qD7d95wj)
zX2%&SjhP!pkk1Vl(~|k0f3qm+4rve`(|^N-da7%+HXGa``~Dom5c4JUNIfr?t<yM;
zU?mt5d;)v^&hy`=BcpzsT+|~Gmq{2?56XEh2a%?tEP#wy_kAs)nqG8>@j3yO0Hti!
zZcmqPu~`H__&N@;SlFo`t8Slz9Wjm$-_<W?^Oz$7&2fo`(8Xc94MM7aH&-3-w|_+J
zfp0lG;j$3ezU`~0@2GjO?t$200_=AD{qdk4T!KUKjyLJCz3e<bahmX$nd>BH$g;A>
z0{*X*eAHVu1}TxCV^u&ff0v1vRffp`X7A{gu_1{1@9;}SW6!{i>OX1?riX`lG$JVM
z{=WGFvTCcH%$?=u;a@TLZ?Tva$bYDq-I_Mx#xvn*2Q<HdE<vWdh$iN_rJG4IwQA|e
z-JWB-y3<vE)3EWE4l)|mZZI4-zDOz1(`NZ=NRNdlP77-@ld;7pL_|rZE5jY;R)vG;
ztg9$aq{Xfsrz3y~n9r^YeZ{a=UlK!yD~%gJDGjJ$SICO7vzpd1i&r|(DSz_Q6lWj$
z1sZyuM(k`_Mbo>k&jdTSyXsK4&{R(AO8MQ)RD3e|*lk>8@Tb3a*TIN5dMm`O3~gkd
zx;2svAvWdS8NP<01n2RT)Ji5Xj1W%*Y!l0*DK_|3;Sh)6;w~c3QOLlX+$UrH6y;1;
zFZT}waHMAJ#nds7x0^=;ZGUKm3ega&`yqj|^&n$ULHno#|3?5g;(6Z=G4F_`$-o-e
z@Ch_T2{uy!4w^fPxmmvuj$UhOr727rx1?K>fsdw-v?i%MMA(h8A>I`%Z*@+=IQD0r
zM<&l`yRvX5it}pN<ghzzS?$))dpuV;yvyH3zb?3VVv<!AALyY+Qh%*S$lBhu?bdB7
z==1=@{){VM=blHIQPR-9=V}sq{L_aXN@^B>uaOY1%noIl5)$U%>oI7i6SP|foG%nM
zR(tr7MCjMs@z{i$yPuzG>5$hJ_T}HS*LE|?RlhKsbT=u&mYGUaLwTKX|2CXZm&v&C
zY%nlRMb8@i=6#=V1!qz4l%2a=eOfNTNVeB8B`_lf2`Yw2hW8Bt2^BFG1QbPMF6tO;
z63@ab3+0r5Kov&1_0ljgFd;Ar1_dh)0|FWa00b0;cK89Z4rh3PEFKqGMl6ZU43}60
Q2p&+mNFibe4*~)R0Gfl7ZU6uP

diff --git a/src/tests/pkinit-certs/generic.pem b/src/tests/pkinit-certs/generic.pem
index c16d0e7c50..55ebb3dbff 100644
--- a/src/tests/pkinit-certs/generic.pem
+++ b/src/tests/pkinit-certs/generic.pem
@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDZjCCAk4CAQcwDQYJKoZIhvcNAQELBQAwgacxCzAJBgNVBAYTAlVTMRYwFAYD
-VQQIDA1NYXNzYWNodXNldHRzMRIwEAYDVQQHDAlDYW1icmlkZ2UxDDAKBgNVBAoM
-A01JVDEpMCcGA1UECwwgSW5zZWN1cmUgUEtJTklUIEtlcmJlcm9zIHRlc3QgQ0Ex
-MzAxBgNVBAMMKnBraW5pdCB0ZXN0IHN1aXRlIENBOyBkbyBub3QgdXNlIG90aGVy
-d2lzZTAeFw0xOTAyMTgwMDI1NTZaFw0zMDAxMzEwMDI1NTZaMEoxCzAJBgNVBAYT
-AlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRzMRQwEgYDVQQKDAtLUkJURVNULkNP
-TTENMAsGA1UEAwwEdXNlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-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==
+MIIDazCCAlOgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
+FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
+A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
+dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
+b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMVoXDTMyMDkyMDIxMTEzMVowSjELMAkG
+A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
+U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAz6VXmJpVq2zTIEU3gUF7pui+Wg17d3QX2oy6EqqUQK/pwWtrvmBIaYcn
+Pq0ZMrzMhNTuyeLjb1rNNkL0hCdS3/aVbx1bOlkPVPlW3UNi9gWpXOOE1/N4QMrz
+yKAQ1/Npf9xjY/vpqsmvRx7AZpq7Nq7HyF5hbUKMHFaaTqRarhoP7mOCByG8F44Y
+QTY2RXcw9te63x+77c3O64gbtnSKXBC/4pS9DxBBv1ULB2wOH8RGxDiWgL0/iO25
+YImKQgTvwbENw4ygLV+0m1b+YEJLaIIeKleunYEMMkzIfFmMemXRWgNHuShYa0Pe
+yiwTBSRdW9Yi4qzjfaHZ1dD67wdoGwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCS
+OTfZununxFDxuThhIFDWEZ9p2qSqTrxKtKx4CDvdckz4kaKybiNZTW7Dlh6IwWta
+60eq98WrMHXYlSaN87r95lU0ug2RFJh4uLdq3a5NM/daIIjO0Bo86oC+8EBM961Q
+mCMe7dn9ngFK92msdqO+wfpAfvhSpBPtAjQovigirheiEoER/ov9t9/3mRi5OTkY
+8YfKT/z6XJrnOUIB3AgCdGyzSRvWLqLrbh7iAFVrm6Pq6D2nNr+mE9r5u7uFl3r8
+QeDgp0Unwd1ISWTHZlrP4bq29w7y2O+/2KV04Og8z+4zoGD4nRinuJBUdNqwAXVz
+dz6pXFWgLRD+9ddI5jB0
 -----END CERTIFICATE-----
diff --git a/src/tests/pkinit-certs/kdc.pem b/src/tests/pkinit-certs/kdc.pem
index 14ac0008b2..e46afc177f 100644
--- a/src/tests/pkinit-certs/kdc.pem
+++ b/src/tests/pkinit-certs/kdc.pem
@@ -3,27 +3,27 @@ MIIE4TCCA8mgAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
 FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
 A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
 dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
-b3RoZXJ3aXNlMB4XDTE5MDIxODAwMjU1NVoXDTMwMDEzMTAwMjU1NVowSTELMAkG
+b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMFoXDTMyMDkyMDIxMTEzMFowSTELMAkG
 A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
 U1QuQ09NMQwwCgYDVQQDDANLREMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-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
+AoIBAQDPpVeYmlWrbNMgRTeBQXum6L5aDXt3dBfajLoSqpRAr+nBa2u+YEhphyc+
+rRkyvMyE1O7J4uNvWs02QvSEJ1Lf9pVvHVs6WQ9U+VbdQ2L2Balc44TX83hAyvPI
+oBDX82l/3GNj++mqya9HHsBmmrs2rsfIXmFtQowcVppOpFquGg/uY4IHIbwXjhhB
+NjZFdzD217rfH7vtzc7riBu2dIpcEL/ilL0PEEG/VQsHbA4fxEbEOJaAvT+I7blg
+iYpCBO/BsQ3DjKAtX7SbVv5gQktogh4qV66dgQwyTMh8WYx6ZdFaA0e5KFhrQ97K
+LBMFJF1b1iLirON9odnV0PrvB2gbAgMBAAGjggFzMIIBbzAdBgNVHQ4EFgQU9Bel
++9UEX7Q4knjUmN25LN5ytCMwgdQGA1UdIwSBzDCByYAU9Bel+9UEX7Q4knjUmN25
+LN5ytCOhga2kgaowgacxCzAJBgNVBAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNl
 dHRzMRIwEAYDVQQHDAlDYW1icmlkZ2UxDDAKBgNVBAoMA01JVDEpMCcGA1UECwwg
 SW5zZWN1cmUgUEtJTklUIEtlcmJlcm9zIHRlc3QgQ0ExMzAxBgNVBAMMKnBraW5p
 dCB0ZXN0IHN1aXRlIENBOyBkbyBub3QgdXNlIG90aGVyd2lzZYIBATALBgNVHQ8E
 BAMCA+gwDAYDVR0TAQH/BAIwADBIBgNVHREEQTA/oD0GBisGAQUCAqAzMDGgDRsL
 S1JCVEVTVC5DT02hIDAeoAMCAQKhFzAVGwZrcmJ0Z3QbC0tSQlRFU1QuQ09NMBIG
-A1UdJQQLMAkGBysGAQUCAwUwDQYJKoZIhvcNAQELBQADggEBACoRg0+LnZehgdfM
-xy/zTXj3kH30W++NTErQAOEEOm8KscaWIF/GXNDX9G+C4tvT/LN3vHCd+hnGgvTr
-kkJlyYtLZZgkv7sa1PQW3yozhjOPRzdjiXitV6RsE4ujzwbcr3Zd0twZnf7nDbIt
-HmgjQJF5EMUprgPc1M3xdRVvi5FP/rvoUV03eI5/EmyvJ2046XfTD45pQgJdCWnO
-+KsFpaUIH6u4neWU4UdBxAsgo0/20pDYNM8GgPXY76wRi9yZ1Fgg2gJTS7QMpgyp
-ux0vuwbq3iuo4VFMhNyGmR2NeCF7OGUPSmjD/pCck9Vzk7Q7ainv58PHAyXIhM0E
-C+aVsEk=
+A1UdJQQLMAkGBysGAQUCAwUwDQYJKoZIhvcNAQELBQADggEBAJZd7v5ZOMs8Y3ht
+Kmtql8rKs0Jee73gVHYw3LXxJfHjIiNGdexxuWJ6Hy9gFnfwSco+15HP3MxMBkau
+TKo3i1+Kwf+lc7gIZ0g/CEnYOx2smHGd9yGudWypunYLjGWfH/2M8/Wu1gZDTxQ1
+pNMQZ2pPLL/C6c6vYpVQJ5cA0RSh/SC5IbOESUpZaFFMYxF5TNz+28/lDr/rN41O
+miklos6cH5EkJyI0WUqJMk04HHjREl/9RTak8mo/eaqjUMTAOyweSwpaYRCddBOo
+y1ix9yH0fSBib1+WQ3MAHZHgbgVnu7V2GnB6qMNqRLHoGa03x+5Q1X0QuKxP6iYo
+9tiGt3k=
 -----END CERTIFICATE-----
diff --git a/src/tests/pkinit-certs/make-certs.sh b/src/tests/pkinit-certs/make-certs.sh
index 8aa71a975e..5284f42599 100755
--- a/src/tests/pkinit-certs/make-certs.sh
+++ b/src/tests/pkinit-certs/make-certs.sh
@@ -112,6 +112,8 @@ keyUsage = nonRepudiation,digitalSignature,keyEncipherment,keyAgreement
 basicConstraints = critical,CA:FALSE
 subjectAltName = otherName:$KRB5_UPN_SAN;UTF8:user@$REALM
 extendedKeyUsage = $CLIENT_EKU_LIST
+
+[exts_none]
 EOF
 
 # Generate a private key.
@@ -122,56 +124,49 @@ openssl rsa -in privkey.pem -out privkey-enc.pem -des3 -passout pass:encrypted
 SUBJECT=ca openssl req -config openssl.cnf -new -x509 -extensions exts_ca \
     -set_serial 1 -days $DAYS -key privkey.pem -out ca.pem
 
+serial=2
+gen_cert() {
+    SUBJECT=$1 openssl req -config openssl.cnf -new -key privkey.pem -out csr
+    SUBJECT=$1 openssl x509 -extfile openssl.cnf -extensions $2 \
+           -set_serial $serial -days $DAYS -req -CA ca.pem -CAkey privkey.pem \
+           -in csr -out $3
+    serial=$((serial + 1))
+    rm -f csr
+}
+
+gen_pkcs12() {
+    # Use -descert to make OpenSSL 1.1 generate files OpenSSL 3.0 can
+    # read (the default uses RC2, which is only available in the
+    # legacy provider in OpenSSL 3).  This option causes an algorithm
+    # downgrade with OpenSSL 3.0 (AES to DES3), but that isn't
+    # important for test certs.
+    openssl pkcs12 -export -descert -in "$1" -inkey privkey.pem -out "$2" \
+            -passout pass:"$3"
+}
+
 # Generate a KDC certificate.
-SUBJECT=kdc openssl req -config openssl.cnf -new -key privkey.pem -out kdc.csr
-SUBJECT=kdc openssl x509 -extfile openssl.cnf -extensions exts_kdc \
-    -set_serial 2 -days $DAYS -req -CA ca.pem -CAkey privkey.pem \
-    -out kdc.pem -in kdc.csr
+gen_cert kdc exts_kdc kdc.pem
 
 # Generate a client certificate and PKCS#12 bundles.
-SUBJECT=user openssl req -config openssl.cnf -new -key privkey.pem \
-    -out user.csr
-SUBJECT=user openssl x509 -extfile openssl.cnf -extensions exts_client \
-    -set_serial 3 -days $DAYS -req -CA ca.pem -CAkey privkey.pem \
-    -out user.pem -in user.csr
-openssl pkcs12 -export -in user.pem -inkey privkey.pem -out user.p12 \
-    -passout pass:
-openssl pkcs12 -export -in user.pem -inkey privkey.pem -out user-enc.p12 \
-    -passout pass:encrypted
-
-# Generate a client certificate and PKCS#12 bundles with a UPN SAN.
-SUBJECT=user openssl req -config openssl.cnf -new -key privkey.pem \
-    -out user-upn.csr
-SUBJECT=user openssl x509 -extfile openssl.cnf -extensions exts_upn_client \
-    -set_serial 4 -days $DAYS -req -CA ca.pem -CAkey privkey.pem \
-    -out user-upn.pem -in user-upn.csr
-openssl pkcs12 -export -in user-upn.pem -inkey privkey.pem -out user-upn.p12 \
-    -passout pass:
-
-SUBJECT=user openssl req -config openssl.cnf -new -key privkey.pem \
-    -out user-upn2.csr
-SUBJECT=user openssl x509 -extfile openssl.cnf -extensions exts_upn2_client \
-    -set_serial 5 -days $DAYS -req -CA ca.pem -CAkey privkey.pem \
-    -out user-upn2.pem -in user-upn2.csr
-openssl pkcs12 -export -in user-upn2.pem -inkey privkey.pem \
-     -out user-upn2.p12 -passout pass:
-
-SUBJECT=user openssl req -config openssl.cnf -new -key privkey.pem \
-    -out user-upn3.csr
-SUBJECT=user openssl x509 -extfile openssl.cnf -extensions exts_upn3_client \
-    -set_serial 6 -days $DAYS -req -CA ca.pem -CAkey privkey.pem \
-    -out user-upn3.pem -in user-upn3.csr
-openssl pkcs12 -export -in user-upn3.pem -inkey privkey.pem \
-     -out user-upn3.p12 -passout pass:
+gen_cert user exts_client user.pem
+gen_pkcs12 user.pem user.p12
+gen_pkcs12 user.pem user-enc.p12 encrypted
+
+# Generate a client certificate and PKCS#12 bundle with a UPN SAN.
+gen_cert user exts_upn_client user-upn.pem
+gen_pkcs12 user-upn.pem user-upn.p12
+
+# Same, but with no realm in the UPN SAN.
+gen_cert user exts_upn2_client user-upn2.pem
+gen_pkcs12 user-upn2.pem user-upn2.p12
+
+# Same, but with an uppercase realm in the UPN SAN.
+gen_cert user exts_upn3_client user-upn3.pem
+gen_pkcs12 user-upn3.pem user-upn3.p12
 
 # Generate a client certificate and PKCS#12 bundle with no PKINIT extensions.
-SUBJECT=user openssl req -config openssl.cnf -new -key privkey.pem \
-    -out generic.csr
-SUBJECT=user openssl x509 -set_serial 7 -days $DAYS -req -CA ca.pem \
-    -CAkey privkey.pem -out generic.pem -in generic.csr
-openssl pkcs12 -export -in generic.pem -inkey privkey.pem -out generic.p12 \
-    -passout pass:
+gen_cert user exts_none generic.pem
+gen_pkcs12 generic.pem generic.p12
 
 # Clean up.
-rm -f openssl.cnf kdc.csr user.csr user-upn.csr user-upn2.csr user-upn3.csr
-rm -f generic.csr
+rm -f openssl.cnf
diff --git a/src/tests/pkinit-certs/privkey-enc.pem b/src/tests/pkinit-certs/privkey-enc.pem
index 81e05d31aa..29d2f3d38c 100644
--- a/src/tests/pkinit-certs/privkey-enc.pem
+++ b/src/tests/pkinit-certs/privkey-enc.pem
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,9F0F79BAC91A7D02
+DEK-Info: DES-EDE3-CBC,5FFF1E71BFFB65E3
 
-LiK+0vY3CKK7z7q/0576K/zcR/OzmiDMLdjQEN/en8Wk9fq9LkjbZ7xbnS5eNlZA
-6McUX32M5MvfJE5tVPcijdlenKg3LEVQh91Omb63DT9TJaM2I+zIwKmFS8l1qqbB
-tO5T3qChaHJ+vnmH24Ukn9wMZ/AgV7X0aSeIJ89B+kgYyBkfoh//h64dlWgqcd+L
-4+wo6azx6k9feFV2/WwdmEG+etMS4iw3kw7jdRVG6G1himsXc9AL35TD1CKX/OAj
-InMgrMaWmf7w8rO5LBNUj4i/lBjNjqElBRGZnfCmSpyoERDWv5JEBuSYjZaP6iPq
-XAisHkJmfubN9omah/y5aNsJ8jbMjZDhBxdzA1mGuteKfnkckOgZ1YXvAZGXGxd4
-cGFzVmRwgnktsycVGpAy2P1wnOdTgo+FUkMpRIwPc1EfiPiOscUTNyZKnkNbTBk0
-l51QXXvLaZaL/Q/9mF+QfdiBDXLtxu2ZU+miA7/srJSdSxqp1UQH9kO8t0UFv4tT
-Mc4JilR4W0+IxjTFvBqirpf64MJ6rL2f0ZdJ6k9l7nBnaIeT4G7KXhR3t0YbGqyK
-kOTeUibfdgMlj66R+KHg0mlDI6E5rM/1L5GchsKIsbJs4TgD1+fcEvJMTB1XCtWM
-usY3Y/JChquKbWngFrzqidcab0xO+RsFaxboMd/RoW3bsDOIiOmf+PQfPjXFpP23
-I3Plrm9DczQTbClt5YacW6g/aboMCHhjbCh8nBSEc5u0CssqmtHe2PST9XZZ/1ny
-t480up13b3rMX3QWr74gRQ4vGsBxmCbN1DdkglJYZzYtIoTH5qAeUk7oRrRCW8wj
-YkODoLLsb/1lJKHHlq8lj0h/ygn3aaYlmdXrXoPdnld0RwaS/35KjNZy6A6UEDGt
-z91615joi/m+V4GQr/OrJ+gWKp19Rs7qUViNPY/RkvdmWAlH7uz+kmo8hK5IeshD
-iWhZ179XIkX0YeeB8r2sRkO2qecVzRxhRtBFVt0MpuDUW3pZ+A6pB7utrKn2//TD
-ZqWbwpdVdolWjru5iDt88nLxXHEGSs7GprH2iL3/aNsOJ6BrUwNVx52YBEGeNhFW
-mH+E8nLQDaGgB68UnQUMzktrkmv2baAsPK1oQLDJSzN9nbhyE4ETiN2Ok1Kso30b
-fDRDUB3SbXldWUXtVmu+NzO8pJVFpQ1StXpWimrwjWB3Kbi8bs2VYai7+B4mTXYy
-8AVthJNuOnlvSB+FYMOaW9PrmuahgXT0wjsV2hkP+qe6mzj0AQHFpFJRuCtGuRog
-spA2SgQvMO4cceJ3cxh1p5Z2/s+oC3V3ikDSDvmcpU/4FF5H/4Th44RSmXABcr7L
-HFbYYKbJjfwlYh48feS7sJMAFlU41al8vCIJneNF8hSSFM05icZVBzqjDjzXHwb4
-kBvrIOtDf/CVZK9AzykvJRROIFI+2ifa+gPmTZ1Xgv0aqO8ibLSU8v2vx5RX2BCO
-Jq+lmYEr6PZn2X5C3iqE+xvdTz7Sh0+Ilq/lE4DEJqr4NtZaGxXBwFNixLHJlXfI
-u/LmbffnBsu2hf9zPxsmcm5yCqa9+XKtWNhx5PEcQsee6PXyGX/GHtek4pBOv/dd
+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
 -----END RSA PRIVATE KEY-----
diff --git a/src/tests/pkinit-certs/privkey.pem b/src/tests/pkinit-certs/privkey.pem
index 48f0ae989f..007b6275df 100644
--- a/src/tests/pkinit-certs/privkey.pem
+++ b/src/tests/pkinit-certs/privkey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEoAIBAAKCAQEAz6VXmJpVq2zTIEU3gUF7pui+Wg17d3QX2oy6EqqUQK/pwWtr
+vmBIaYcnPq0ZMrzMhNTuyeLjb1rNNkL0hCdS3/aVbx1bOlkPVPlW3UNi9gWpXOOE
+1/N4QMrzyKAQ1/Npf9xjY/vpqsmvRx7AZpq7Nq7HyF5hbUKMHFaaTqRarhoP7mOC
+ByG8F44YQTY2RXcw9te63x+77c3O64gbtnSKXBC/4pS9DxBBv1ULB2wOH8RGxDiW
+gL0/iO25YImKQgTvwbENw4ygLV+0m1b+YEJLaIIeKleunYEMMkzIfFmMemXRWgNH
+uShYa0PeyiwTBSRdW9Yi4qzjfaHZ1dD67wdoGwIDAQABAoIBAEpnKYMR0h6xyNjo
+VGIpT6BYB1UHPbVo0N9Ly6TCoIqpPe5DioDVyTye5A4OQlgu1G3ISqPme6478ApA
+ZZMw7/42QgdlknnOzbKaAWkZK02Sa8RP9hrXL8CvuDisOjzXCHd7RdXevzSmPfsS
+5sgdK3YFnKqMPwbCcKf61CHXvHJjWGuTIHIRh8P7gJelA4ahO0kYQ8aRXv3ldquO
+ukSI5gyk9CN+aAHqt25kEmt9oOgk+8kfKpnk+5gkOCY2YOFDDckD7nL1VIIrDxwG
+SmU598qjVwycDairWUY8uSuPCOLgbvDM9N8cERDMsyNQL63GE8ZZyHZsJ3Pbwdfs
+JVHh5ekCgYEA/CwhaT9D0WQ49GQdeI7aqazHEYDmqPdE2/qbmr67tPMZzX8AAk9j
+r4aMT+oIdtIMPdoQNNcBP6NYZLlAoMbLoAzHmWJnF5/YWLnS2Wg9OuXUOBn3jk1l
+SWelJfAKGeBld5fpSLTdHjRAwJrNCX+mc0IZIiEw2IvGUPgKGX08bX8CgYEA0swx
+xCDgvfoaKueInw/rUIcKxrSxK3pDhaR01Dg2pwSo7Vj9W01zf33qe+mjma6+U2SB
+fk+/O2VXDuEOmVDLwvp6PkmUeRE5PyH7urTMEjy5ELNGiZd9zHoG/zJnRgPwTjuW
+yguvjVGJwI1IvmODuA7Xc7iHFlvGNuxXZjPkS2UCgYA0nFxoIdvbTsaXLl/7rAow
+xixOGY+GBvil0HYwZcSxrtpeRjXRRZDtqOuTLKeRaqdFLD6fV5AaH9EsSn4STQdk
+n+XwuVf61M2FTVeRJi9IH3UUM06zsLAGDYqmDJt+5JMmzVnNYnaTe6FazbEjXy9x
+8oNd3IDdXOQGNomc4cT+rwKBgBbABOr25Wp7cJGK1XrdO/c/69DQNYLMujbVLeqt
+enCCFz0uaoGNFVcAHutqpsZyToYvha49KxVc9Y1cirfPOX58i+7nAAgk7Lm8kC9x
+Tcj2Fr8PqiA1YlVMIi8uoGi1Ch1XXwnFQxgMYcKPPPeXQ+L8bxJFKwcltnm8/h3A
+ofXlAn9AW6fYZLSzOfNQTMnuukhuAtZcEW9NlJHbej305zK89J66S8wroQs5iOla
+5GG+S4YaZh5sVGw+mnS+FCw7cQCUk40kXwX3yTrxlX1qGSCFCQnFdJow+5NVg4D+
+dzDKzniH71OZZFxTqiiz76XxiaW/rS1uOfP/WSVR9NBLpV5n
 -----END RSA PRIVATE KEY-----
diff --git a/src/tests/pkinit-certs/user-enc.p12 b/src/tests/pkinit-certs/user-enc.p12
index 39e9d31b065b342d637ae053dbf18af0d0e10183..1cc3aa3da67160fd9298b9e2d624a80c5225245b 100644
GIT binary patch
delta 2805
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
H0s;sCrwclW

delta 2813
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
P)Gzx(p$jNA0s;sCmM}zc

diff --git a/src/tests/pkinit-certs/user-upn.p12 b/src/tests/pkinit-certs/user-upn.p12
index df931d71e3ae38b40473025c2a804d3fa9c5ae8c..bf47384a8a654fa77d9d9161c801292292ccf4ab 100644
GIT binary patch
delta 2797
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

delta 2805
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
H0s;sCY|TQG

diff --git a/src/tests/pkinit-certs/user-upn.pem b/src/tests/pkinit-certs/user-upn.pem
index 37fcab8d77..14a11831d7 100644
--- a/src/tests/pkinit-certs/user-upn.pem
+++ b/src/tests/pkinit-certs/user-upn.pem
@@ -3,26 +3,26 @@ MIIExTCCA62gAwIBAgIBBDANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
 FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
 A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
 dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
-b3RoZXJ3aXNlMB4XDTE5MDIxODAwMjU1NVoXDTMwMDEzMTAwMjU1NVowSjELMAkG
+b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMVoXDTMyMDkyMDIxMTEzMVowSjELMAkG
 A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
 U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvq6eZ7Cigf5dH22+PlW3AP65TJ35ggGx5aNBl+Xjjup2Y1qHe2o/pUIE
-avg3d9hmus8ovsJEuWxsXyo/navpScSNUbBW5ig2jgSmzQOA1Lv5dzG+JgF71EI8
-kfe3/Y+1js2udpbsD+HjvU3QgZOPDO514gGLEt8UpyfymvBBz7ohDpPPdGD/hcJM
-XEiSNvLhVbIoENY6l5reA8z129Hs+JWycJ8ImUUH72bt6cP348WuJ7RQzt7NrBnn
-XiPGjWW5l9ewUkOkHpmLeIADyA3NUAXYI40whJkOUPhtMW2PnzM9CYKFpCVh4SKx
-71iB9KO5Y4sLHs9neXQncmhtr6lzEQIDAQABo4IBVjCCAVIwHQYDVR0OBBYEFGxN
-/r1v8njf7axXLec5+PyebI4WMIHUBgNVHSMEgcwwgcmAFGxN/r1v8njf7axXLec5
-+PyebI4WoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+CgKCAQEAz6VXmJpVq2zTIEU3gUF7pui+Wg17d3QX2oy6EqqUQK/pwWtrvmBIaYcn
+Pq0ZMrzMhNTuyeLjb1rNNkL0hCdS3/aVbx1bOlkPVPlW3UNi9gWpXOOE1/N4QMrz
+yKAQ1/Npf9xjY/vpqsmvRx7AZpq7Nq7HyF5hbUKMHFaaTqRarhoP7mOCByG8F44Y
+QTY2RXcw9te63x+77c3O64gbtnSKXBC/4pS9DxBBv1ULB2wOH8RGxDiWgL0/iO25
+YImKQgTvwbENw4ygLV+0m1b+YEJLaIIeKleunYEMMkzIfFmMemXRWgNHuShYa0Pe
+yiwTBSRdW9Yi4qzjfaHZ1dD67wdoGwIDAQABo4IBVjCCAVIwHQYDVR0OBBYEFPQX
+pfvVBF+0OJJ41JjduSzecrQjMIHUBgNVHSMEgcwwgcmAFPQXpfvVBF+0OJJ41Jjd
+uSzecrQjoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
 ZXR0czESMBAGA1UEBwwJQ2FtYnJpZGdlMQwwCgYDVQQKDANNSVQxKTAnBgNVBAsM
 IEluc2VjdXJlIFBLSU5JVCBLZXJiZXJvcyB0ZXN0IENBMTMwMQYDVQQDDCpwa2lu
 aXQgdGVzdCBzdWl0ZSBDQTsgZG8gbm90IHVzZSBvdGhlcndpc2WCAQEwCwYDVR0P
 BAQDAgPoMAwGA1UdEwEB/wQCMAAwKwYDVR0RBCQwIqAgBgorBgEEAYI3FAIDoBIM
 EHVzZXJAa3JidGVzdC5jb20wEgYDVR0lBAswCQYHKwYBBQIDBDANBgkqhkiG9w0B
-AQsFAAOCAQEAeZXuyTRD2XQEcUoOYRXn6V1Glh61eHJ4e5ggp0QmTZoij8Y5YdmV
-jt4N8PE1wdXr0f7+a49Zh+YrKt7NZw4HlevYSMIyHVEeLe05zTFYL0w9R1P+16pf
-iSLmmwXZXBPX0biQq2wklD71GBFh/FF02uuetA/iPLMXvgfEUnbjVCcLpTc2/ISg
-tkGvWXtE06YXwSn3ANbCQPLifUKW2PZ8jGBOLLvslebvvJruWyfFLolkNsyA+ljr
-GvWZMxKTOD3LECHvLWFfl7xJsUNqL5qptz0baxeCrmaAdQdHvs4DApxebh1BZGn8
-KFV4g+N0Qz28tO0GSEA3cd2JHVz+wWQp7Q==
+AQsFAAOCAQEAYTW8tzURX2s8vuDawXEJt2as5q2MnvhUmG0YPIvK4n2fODkMW/I9
+XENFhK8wwQJNdzvBUwXUXzEGjFcGPs672ZVzykRb7sAfGlNu1f15z0KrjyUj82oz
+/gWoLwdYwZnO8jqtKjGtnLi2MeWjVCoiUW5ypUGwtEdcyZUG0PeRUrdrZu5cm+iZ
+1B1exR4lepR1iSAPYTNhp5VF6T8BSLf2BO2IKTgFnF4Xx1vyZZTsY10mruZ8S1ZR
+XiajBVdHkN1BpWWyFKt1BCt0dpRx9W7CihC3Ln9fBCsY8QA969EjRhszG2i09Xxw
+0M6/UgIQRU6hy7QTlcmehDKY0zvVJ2/RLw==
 -----END CERTIFICATE-----
diff --git a/src/tests/pkinit-certs/user-upn2.p12 b/src/tests/pkinit-certs/user-upn2.p12
index e11860e6846f770b4c481bbe91fe358c835a0bdb..69ca648aab9f1c5ffe34387459d45eb45bb04922 100644
GIT binary patch
delta 2781
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

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

diff --git a/src/tests/pkinit-certs/user-upn2.pem b/src/tests/pkinit-certs/user-upn2.pem
index 66d6b3e3b2..baef41a5ac 100644
--- a/src/tests/pkinit-certs/user-upn2.pem
+++ b/src/tests/pkinit-certs/user-upn2.pem
@@ -3,26 +3,26 @@ MIIEuTCCA6GgAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
 FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
 A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
 dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
-b3RoZXJ3aXNlMB4XDTE5MDIxODAwMjU1NVoXDTMwMDEzMTAwMjU1NVowSjELMAkG
+b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMVoXDTMyMDkyMDIxMTEzMVowSjELMAkG
 A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
 U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvq6eZ7Cigf5dH22+PlW3AP65TJ35ggGx5aNBl+Xjjup2Y1qHe2o/pUIE
-avg3d9hmus8ovsJEuWxsXyo/navpScSNUbBW5ig2jgSmzQOA1Lv5dzG+JgF71EI8
-kfe3/Y+1js2udpbsD+HjvU3QgZOPDO514gGLEt8UpyfymvBBz7ohDpPPdGD/hcJM
-XEiSNvLhVbIoENY6l5reA8z129Hs+JWycJ8ImUUH72bt6cP348WuJ7RQzt7NrBnn
-XiPGjWW5l9ewUkOkHpmLeIADyA3NUAXYI40whJkOUPhtMW2PnzM9CYKFpCVh4SKx
-71iB9KO5Y4sLHs9neXQncmhtr6lzEQIDAQABo4IBSjCCAUYwHQYDVR0OBBYEFGxN
-/r1v8njf7axXLec5+PyebI4WMIHUBgNVHSMEgcwwgcmAFGxN/r1v8njf7axXLec5
-+PyebI4WoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+CgKCAQEAz6VXmJpVq2zTIEU3gUF7pui+Wg17d3QX2oy6EqqUQK/pwWtrvmBIaYcn
+Pq0ZMrzMhNTuyeLjb1rNNkL0hCdS3/aVbx1bOlkPVPlW3UNi9gWpXOOE1/N4QMrz
+yKAQ1/Npf9xjY/vpqsmvRx7AZpq7Nq7HyF5hbUKMHFaaTqRarhoP7mOCByG8F44Y
+QTY2RXcw9te63x+77c3O64gbtnSKXBC/4pS9DxBBv1ULB2wOH8RGxDiWgL0/iO25
+YImKQgTvwbENw4ygLV+0m1b+YEJLaIIeKleunYEMMkzIfFmMemXRWgNHuShYa0Pe
+yiwTBSRdW9Yi4qzjfaHZ1dD67wdoGwIDAQABo4IBSjCCAUYwHQYDVR0OBBYEFPQX
+pfvVBF+0OJJ41JjduSzecrQjMIHUBgNVHSMEgcwwgcmAFPQXpfvVBF+0OJJ41Jjd
+uSzecrQjoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
 ZXR0czESMBAGA1UEBwwJQ2FtYnJpZGdlMQwwCgYDVQQKDANNSVQxKTAnBgNVBAsM
 IEluc2VjdXJlIFBLSU5JVCBLZXJiZXJvcyB0ZXN0IENBMTMwMQYDVQQDDCpwa2lu
 aXQgdGVzdCBzdWl0ZSBDQTsgZG8gbm90IHVzZSBvdGhlcndpc2WCAQEwCwYDVR0P
 BAQDAgPoMAwGA1UdEwEB/wQCMAAwHwYDVR0RBBgwFqAUBgorBgEEAYI3FAIDoAYM
-BHVzZXIwEgYDVR0lBAswCQYHKwYBBQIDBDANBgkqhkiG9w0BAQsFAAOCAQEAWf0/
-d0284FjoywSaPpXvy4sJ3N+Ts1bXmM9NtJT+pKDpyMEisNFQ/kqO2UURT+9dZP5o
-yzMttuNdi0lJ4W8gXE5CeMDJv1z9HUXl6blDOh7YYdqM9Y6rBIKwZHyFZzSlgGIQ
-KHfDbj2dmOJLVPfLZM+MA42G1nmfQPGUMcc4mLp8Xu8x7LXCxJBuXV/gxSEMbLrm
-YNj/mXQJhQwYIZdeBZIBUcdU2rD2bMbHcWAs183ddEg3+CSN8fdppsFT1ZX4ZlPk
-XGSrv9EYC4GLZpLOtB3FwUQ1TmEDMJqzifY8jcS03UdQ0gKZBm83rVMnXvU01CgA
-MI9PN0lFwPEutERN0g==
+BHVzZXIwEgYDVR0lBAswCQYHKwYBBQIDBDANBgkqhkiG9w0BAQsFAAOCAQEAAsGC
+LvikD/nW3eOym4f/uuKBscOGSByP9/HoP8QwvnLYU00i5n+zXSTQctotHIifsRc4
+xHLO8xemJp7rm0h/27C1Wo5AVxJ0cmnDKQf8Ast+QXsz9ZeaeKLa5D8sDOfnZXJB
+aMTb8ChjyZz+KLjXV0VbaVkY95mfqsOoJQcl9wHhNdDOygnSucvA5Svlrbo2rlKt
+75OJZJJWrZxuaBuuSYNpCKyyg61t69hPoDKDQZ8QJZHGugWqQ2swYe9dZpUYy5xV
+CGTLCAk9ZOn8hTCC6xbNaJFjflIjcjpwabw0r986/9GeAF6KqSNbMXKaY4LLuk/8
+5FH9S8/3F56ZCNxbZQ==
 -----END CERTIFICATE-----
diff --git a/src/tests/pkinit-certs/user-upn3.p12 b/src/tests/pkinit-certs/user-upn3.p12
index dae25f8636043e8ba39a53e0385bcee7db23174b..9aabc3a897b48600e25bd7513579b258bc1d46ed 100644
GIT binary patch
delta 2797
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

delta 2805
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
H0s;sCAcH*+

diff --git a/src/tests/pkinit-certs/user-upn3.pem b/src/tests/pkinit-certs/user-upn3.pem
index d39b879b4b..000d567d87 100644
--- a/src/tests/pkinit-certs/user-upn3.pem
+++ b/src/tests/pkinit-certs/user-upn3.pem
@@ -3,26 +3,26 @@ MIIExTCCA62gAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
 FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
 A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
 dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
-b3RoZXJ3aXNlMB4XDTE5MDIxODAwMjU1NVoXDTMwMDEzMTAwMjU1NVowSjELMAkG
+b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMVoXDTMyMDkyMDIxMTEzMVowSjELMAkG
 A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
 U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvq6eZ7Cigf5dH22+PlW3AP65TJ35ggGx5aNBl+Xjjup2Y1qHe2o/pUIE
-avg3d9hmus8ovsJEuWxsXyo/navpScSNUbBW5ig2jgSmzQOA1Lv5dzG+JgF71EI8
-kfe3/Y+1js2udpbsD+HjvU3QgZOPDO514gGLEt8UpyfymvBBz7ohDpPPdGD/hcJM
-XEiSNvLhVbIoENY6l5reA8z129Hs+JWycJ8ImUUH72bt6cP348WuJ7RQzt7NrBnn
-XiPGjWW5l9ewUkOkHpmLeIADyA3NUAXYI40whJkOUPhtMW2PnzM9CYKFpCVh4SKx
-71iB9KO5Y4sLHs9neXQncmhtr6lzEQIDAQABo4IBVjCCAVIwHQYDVR0OBBYEFGxN
-/r1v8njf7axXLec5+PyebI4WMIHUBgNVHSMEgcwwgcmAFGxN/r1v8njf7axXLec5
-+PyebI4WoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+CgKCAQEAz6VXmJpVq2zTIEU3gUF7pui+Wg17d3QX2oy6EqqUQK/pwWtrvmBIaYcn
+Pq0ZMrzMhNTuyeLjb1rNNkL0hCdS3/aVbx1bOlkPVPlW3UNi9gWpXOOE1/N4QMrz
+yKAQ1/Npf9xjY/vpqsmvRx7AZpq7Nq7HyF5hbUKMHFaaTqRarhoP7mOCByG8F44Y
+QTY2RXcw9te63x+77c3O64gbtnSKXBC/4pS9DxBBv1ULB2wOH8RGxDiWgL0/iO25
+YImKQgTvwbENw4ygLV+0m1b+YEJLaIIeKleunYEMMkzIfFmMemXRWgNHuShYa0Pe
+yiwTBSRdW9Yi4qzjfaHZ1dD67wdoGwIDAQABo4IBVjCCAVIwHQYDVR0OBBYEFPQX
+pfvVBF+0OJJ41JjduSzecrQjMIHUBgNVHSMEgcwwgcmAFPQXpfvVBF+0OJJ41Jjd
+uSzecrQjoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
 ZXR0czESMBAGA1UEBwwJQ2FtYnJpZGdlMQwwCgYDVQQKDANNSVQxKTAnBgNVBAsM
 IEluc2VjdXJlIFBLSU5JVCBLZXJiZXJvcyB0ZXN0IENBMTMwMQYDVQQDDCpwa2lu
 aXQgdGVzdCBzdWl0ZSBDQTsgZG8gbm90IHVzZSBvdGhlcndpc2WCAQEwCwYDVR0P
 BAQDAgPoMAwGA1UdEwEB/wQCMAAwKwYDVR0RBCQwIqAgBgorBgEEAYI3FAIDoBIM
 EHVzZXJAS1JCVEVTVC5DT00wEgYDVR0lBAswCQYHKwYBBQIDBDANBgkqhkiG9w0B
-AQsFAAOCAQEAF/V+Cx49jH70LMI7S7SGDFWr6/rtYwjJax7RgZN6JZlakd1R6GHa
-JHwUMmf67V/R3qVWfThhbKjxumEY+whxiszegDwBZC+fFiYbaQMCIchHkx8vkdmK
-ZJ9VznDiA/kp0Ty8JZKG6TMRkkxUo+csEXU4E6TZFZaz9pfPrhxHU21uPbeDeE3h
-sUiUqH7oZBjmSS+2OmAu0v4+/Ex0QkqJACvZYNA5zFpgV0Ux/26EQt/bKiYkXYZq
-CIWP7cd/MRfNqeqlbUVpKcIkk5WPpuqPVffA+f2B1Al5iJ8o1pzqN+awZBLLZv3F
-p1+AeVD5nvWpyHSXmst32OYPPTBL9Yk3uA==
+AQsFAAOCAQEApwXjFJ86RLM4MzbScqk0JGqm+jzaFZ6h5oyt0rlaxdhOl7kqOmIE
+sLhXtvZm75roA+UULZHumB6xg3Y0p7cc6VBAYYycWoNkhWXZMdQ8Q33vMos5cwLY
+kXjl4oTDK53goh8IlriRMV7Tv/QpJ8wh+7iqQn3lak0Tv51JexYGwp5sJREYm8q5
+rr3ChlgH7SWF8mhbu2EEiipm0whEqA4tlNKGBsTQBslnm8sK0VfVDcmLOGbMNjRs
+r+Hkd8yVvhIJ9M+WAp/OeF2vUzPBJtAfIaJBxcZmKtNI5Jk8cK/vScJZboa0qAAz
+2Y1uC9rP830mpOe0juhV2mMPron0hi1HaA==
 -----END CERTIFICATE-----
diff --git a/src/tests/pkinit-certs/user.p12 b/src/tests/pkinit-certs/user.p12
index 97993c07313a15ef2615e4480c76f9f34dd253de..e5520110248530c55338c80fd44414eaa262c4a8 100644
GIT binary patch
delta 2805
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
H0s;sC|93jj

delta 2813
zc-jH|3Ig?w7L^tvFoFva0s#Xsf(q9L2`Yw2hW8Bt2LYgh3djV43dAsi3c!&fHh%^%
z4g?6R&Ov~iY*_~a0tf(rf(0-(2VnW}S1~QOPhgI)1bfA|T>|ILP-hp&4Pja1BYRr^
zC+f>*M9}KsFWgXqU>a>Do(N8(6Kmi$0~D}qQ8fy+h|SWdB@LQ+IS>FZ0-*E^fms2u
zjY;M>{C#cw9$7<Yl9w4f(ma#oNPkuHKD^)RvlqoSA$rQU4HucbJg&HA6%$^e4eq0(
zp5^^*%1uF`zG?ID65jH?1b;nN1)yQOWNEX6$$|cut<ChS(Qix(B$|Ed<zEv#qR`tU
zCT&|@$EsgRE`K~UD~sUMG(8@l!`u<9e<<cA{jRvK+YAP!q_ka7I@x%xuYdIT#+>k2
zK}K6E*RO`UvP0F&$?KM5sOnyAi^(j}<~eEUlQMD;;<1@ItNX|&)&Ex*GR>P4HcZCp
zWpX?!vPytU`Lr03@Xn2Fd(xR&!_Yd~DBa{b?k6N+^fYIT)>sgm1)l|XSb9~|IB@@E
za2<by3~Asj9)(RtyUZV~Uw=glB+r1|DmVyo<|LrPk23T1B94r8knishJ0cF{hg!r+
zEFwr-bxj%%pOR5H;2d&T?*gbsF3ODCIWzWfS*DLCZb#H*?vEWt>XU!aDB0`apY(4C
zRP{wPPs#qM53~G{lqMLDQM`Z5$$tE;Az@|)DdLxR$`E|Tt9Dr7kbk6{X`RHq#Rop@
zYM^6RYS9bmdbnUp!gq|oN~XuQi*>OgxgT$lCeQN$CKVIudfH!W|KEslrl(G^)K%+}
zBv7j5+cps<Mo@JWVN1>(VC?)>HeB2FKzp5NYVPJECC!t=@PGAg7>H0kb@jz-j|sdY
zg)w{OF|tMuWi8<!H-F#lAPN|V;st0(cC{~=mPnH;>ZT!5l=CD+QiZFiUnALr!(|pT
zK0jnH=v-Hzh@zV#k`08tqA8yD$YRiyz=~LKNST8vgy{>ujk!suejjg?%^0Tu>V=Fk
zKp`z2XVodz64^QcCh*<4o{V|x6(XG8h=7z*ip3-uLXzXl4}a=A2pC)I7Fb{ukBIEo
zlg2}+>^9WXz{DDSh|2e(;vMeBi<AmZ6+>8uDUk&T>P*0V4JdwpZpr-m<;7kS!q|-W
zP1dlf^{=MBClYw)h3aHaa%}M<ph2E+d-mjEoL~Y&e%l<>3V)QX49nbnM>HD%0DUE(
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
PGX^RTxnL!;0s;sCV$L@U

diff --git a/src/tests/pkinit-certs/user.pem b/src/tests/pkinit-certs/user.pem
index ab24e99d24..182ea599ac 100644
--- a/src/tests/pkinit-certs/user.pem
+++ b/src/tests/pkinit-certs/user.pem
@@ -3,26 +3,26 @@ MIIE0zCCA7ugAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBpzELMAkGA1UEBhMCVVMx
 FjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEMMAoG
 A1UECgwDTUlUMSkwJwYDVQQLDCBJbnNlY3VyZSBQS0lOSVQgS2VyYmVyb3MgdGVz
 dCBDQTEzMDEGA1UEAwwqcGtpbml0IHRlc3Qgc3VpdGUgQ0E7IGRvIG5vdCB1c2Ug
-b3RoZXJ3aXNlMB4XDTE5MDIxODAwMjU1NVoXDTMwMDEzMTAwMjU1NVowSjELMAkG
+b3RoZXJ3aXNlMB4XDTIxMTAwODIxMTEzMFoXDTMyMDkyMDIxMTEzMFowSjELMAkG
 A1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxFDASBgNVBAoMC0tSQlRF
 U1QuQ09NMQ0wCwYDVQQDDAR1c2VyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvq6eZ7Cigf5dH22+PlW3AP65TJ35ggGx5aNBl+Xjjup2Y1qHe2o/pUIE
-avg3d9hmus8ovsJEuWxsXyo/navpScSNUbBW5ig2jgSmzQOA1Lv5dzG+JgF71EI8
-kfe3/Y+1js2udpbsD+HjvU3QgZOPDO514gGLEt8UpyfymvBBz7ohDpPPdGD/hcJM
-XEiSNvLhVbIoENY6l5reA8z129Hs+JWycJ8ImUUH72bt6cP348WuJ7RQzt7NrBnn
-XiPGjWW5l9ewUkOkHpmLeIADyA3NUAXYI40whJkOUPhtMW2PnzM9CYKFpCVh4SKx
-71iB9KO5Y4sLHs9neXQncmhtr6lzEQIDAQABo4IBZDCCAWAwHQYDVR0OBBYEFGxN
-/r1v8njf7axXLec5+PyebI4WMIHUBgNVHSMEgcwwgcmAFGxN/r1v8njf7axXLec5
-+PyebI4WoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
+CgKCAQEAz6VXmJpVq2zTIEU3gUF7pui+Wg17d3QX2oy6EqqUQK/pwWtrvmBIaYcn
+Pq0ZMrzMhNTuyeLjb1rNNkL0hCdS3/aVbx1bOlkPVPlW3UNi9gWpXOOE1/N4QMrz
+yKAQ1/Npf9xjY/vpqsmvRx7AZpq7Nq7HyF5hbUKMHFaaTqRarhoP7mOCByG8F44Y
+QTY2RXcw9te63x+77c3O64gbtnSKXBC/4pS9DxBBv1ULB2wOH8RGxDiWgL0/iO25
+YImKQgTvwbENw4ygLV+0m1b+YEJLaIIeKleunYEMMkzIfFmMemXRWgNHuShYa0Pe
+yiwTBSRdW9Yi4qzjfaHZ1dD67wdoGwIDAQABo4IBZDCCAWAwHQYDVR0OBBYEFPQX
+pfvVBF+0OJJ41JjduSzecrQjMIHUBgNVHSMEgcwwgcmAFPQXpfvVBF+0OJJ41Jjd
+uSzecrQjoYGtpIGqMIGnMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
 ZXR0czESMBAGA1UEBwwJQ2FtYnJpZGdlMQwwCgYDVQQKDANNSVQxKTAnBgNVBAsM
 IEluc2VjdXJlIFBLSU5JVCBLZXJiZXJvcyB0ZXN0IENBMTMwMQYDVQQDDCpwa2lu
 aXQgdGVzdCBzdWl0ZSBDQTsgZG8gbm90IHVzZSBvdGhlcndpc2WCAQEwCwYDVR0P
 BAQDAgPoMAwGA1UdEwEB/wQCMAAwOQYDVR0RBDIwMKAuBgYrBgEFAgKgJDAioA0b
 C0tSQlRFU1QuQ09NoREwD6ADAgEBoQgwBhsEdXNlcjASBgNVHSUECzAJBgcrBgEF
-AgMEMA0GCSqGSIb3DQEBCwUAA4IBAQAOBmEbWERHmV5YfMrOIY36mevch2KJokw9
-LXZqnKI4oezajEMwx0Wv+M/Gb4ZuYrfobiHSvfzCPUXyyRVWPr8sFBvDXnoBSlos
-g+Y2O8+toyJ8u8gn63SrnPOHCdYkClkDeHI3EzuIcLfgn+Uyg9lkQOjBBNj5O42K
-GoTNCuhoB6IAa66JD2u7E7pfBnceSUYP1DTlCK9l+1C+zOAEuG2N8K4n0ZRZbVqd
-2euMypjorJwgebOzlk86TNzOb5IP8G6phs7D4tvhe7J6mfJ3tFmGbH8V7jY51iCT
-EFQgm39U4J+2uQ0LlEsE3v7wXGW3MLUBY6STcGPwkBrxcmsdKNmy
+AgMEMA0GCSqGSIb3DQEBCwUAA4IBAQAOBeCDK6Eg6Cu8TZ7xeAw2AbTpaW04nNSV
+Fmm0aIskMgLl2a5KEmalG7rnArRXv5IZVYFjJ6X0MzjOx+BgaGUCvN8jz1fuO3Hp
+iGhxPDzKjFMWJeY/z5bQRueSI6RCC8DzH8iPdlPUQ8ZhnukhY1Vt47wqraf197uT
+0XP21qQr1uRY+ZcLSBKZuKe9ZP3ijh57MOLvYDdAFxVp77JLznpk+oU18ujAtYgZ
+7naIGYtSQRkIi970jk82hSpc9B/KN8UcDuo+DQHWPQaDf39s30qoxooZBoue5ipp
+LQHuVaX5Hoi83cWbsVluce/JsW8GfbuC8+8CosAmzJly183f8++9
 -----END CERTIFICATE-----
-- 
2.47.2