From d28cb70735d78f68865c17a90ed90198ff34e03b Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Tue, 21 Dec 2021 09:03:54 -0800
Subject: [PATCH] fix for ed25519 client cert generation

---
 certs/ed25519/ca-ed25519.der          | Bin 592 -> 592 bytes
 certs/ed25519/ca-ed25519.pem          |  18 ++--
 certs/ed25519/client-ed25519.der      | Bin 635 -> 856 bytes
 certs/ed25519/client-ed25519.pem      |  44 +++++-----
 certs/ed25519/gen-ed25519-certs.sh    |   2 +-
 certs/ed25519/root-ed25519.der        | Bin 613 -> 613 bytes
 certs/ed25519/root-ed25519.pem        |  22 ++---
 certs/ed25519/server-ed25519-cert.pem |  22 ++---
 certs/ed25519/server-ed25519.der      | Bin 633 -> 633 bytes
 certs/ed25519/server-ed25519.pem      |  40 ++++-----
 wolfssl/certs_test.h                  | 118 +++++++++++++++-----------
 11 files changed, 147 insertions(+), 119 deletions(-)

diff --git a/certs/ed25519/ca-ed25519.der b/certs/ed25519/ca-ed25519.der
index b244cf22e3538a9079a79ba8bd54a1c85c4e949e..f20249325f20e6d621261426ffc784db4f08e8b5 100644
GIT binary patch
delta 97
zcmcb>a)D*S0Z~IkGZRZ=(<pIXBNGElLo+aU<5g=$hr+b~%m3{B#oQ{a(cl)X)FQKJ
z$Hy<N&1v3?TzZmOcG*Wh+_jlmte}-OHb6l$vnIMp)$nj--K^Jb`|cP&d=SnD0N5EP
AQ~&?~

delta 97
zcmV-n0G|KQ1kePKz!fkuGcY$YHCh)9GBhwbF*PzXFgG%>)jI(|1DNAq$k1gO)VgG*
z-`U0Wd3L&-<+q^{<GBl^K$GmimbYbg9Gpt%Vm^zbh1If)l&xv`RA>Kx34DCtvSM2d
Dtd%V;

diff --git a/certs/ed25519/ca-ed25519.pem b/certs/ed25519/ca-ed25519.pem
index 61ac1b33f..eb206841e 100644
--- a/certs/ed25519/ca-ed25519.pem
+++ b/certs/ed25519/ca-ed25519.pem
@@ -5,8 +5,8 @@ Certificate:
         Signature Algorithm: ED25519
         Issuer: C = US, ST = Montana, L = Bozeman, O = wolfSSL_Ed25519, OU = Root-Ed25519, CN = www.wolfssl.com, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 20 23:07:25 2021 GMT
-            Not After : Sep 15 23:07:25 2024 GMT
+            Not Before: Dec 21 16:49:35 2021 GMT
+            Not After : Sep 16 16:49:35 2024 GMT
         Subject: C = US, ST = Montana, L = Bozeman, O = wolfSSL_ed25519, OU = CA-ed25519, CN = www.wolfssl.com, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: ED25519
@@ -26,22 +26,22 @@ Certificate:
             X509v3 Key Usage: critical
                 Digital Signature, Certificate Sign, CRL Sign
     Signature Algorithm: ED25519
-         03:98:e3:5f:c8:d0:65:19:d4:ba:64:a6:df:d9:c5:f5:79:76:
-         ba:9c:e5:b7:a1:12:e3:b9:0b:a5:40:93:ec:c0:96:b7:65:76:
-         1c:9c:4a:e8:62:3e:8b:a3:85:d5:b2:8b:94:ad:69:f9:54:67:
-         ff:7f:09:7c:7c:df:b2:62:5b:0c
+         71:66:ff:a7:fc:b9:fa:03:85:13:28:80:46:5b:22:84:1c:a2:
+         b8:f1:f4:85:83:66:4b:a2:44:8c:63:04:ba:3f:59:e1:ba:b3:
+         03:16:70:85:05:5d:50:20:29:69:7c:5b:82:25:31:c3:79:7e:
+         9a:eb:86:be:dc:33:e1:e0:57:0e
 -----BEGIN CERTIFICATE-----
 MIICTDCCAf6gAwIBAgIBATAFBgMrZXAwgZ0xCzAJBgNVBAYTAlVTMRAwDgYDVQQI
 DAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRgwFgYDVQQKDA93b2xmU1NMX0Vk
 MjU1MTkxFTATBgNVBAsMDFJvb3QtRWQyNTUxOTEYMBYGA1UEAwwPd3d3LndvbGZz
 c2wuY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTIxMTIy
-MDIzMDcyNVoXDTI0MDkxNTIzMDcyNVowgZsxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
+MTE2NDkzNVoXDTI0MDkxNjE2NDkzNVowgZsxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
 DAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRgwFgYDVQQKDA93b2xmU1NMX2Vk
 MjU1MTkxEzARBgNVBAsMCkNBLWVkMjU1MTkxGDAWBgNVBAMMD3d3dy53b2xmc3Ns
 LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAqMAUGAytlcAMh
 AEI7evmCz/nfGd3z8DIpbfr9dk9owsLgbEeuwlVorA1No2MwYTAdBgNVHQ4EFgQU
 dNU4GV6DuQP4AYo1NbuJTEm0I+kwHwYDVR0jBBgwFoAU+rpbdh3xHR1NdEjYmDtW
 77MU894wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwBQYDK2VwA0EA
-A5jjX8jQZRnUumSm39nF9Xl2upzlt6ES47kLpUCT7MCWt2V2HJxK6GI+i6OF1bKL
-lK1p+VRn/38JfHzfsmJbDA==
+cWb/p/y5+gOFEyiARlsihByiuPH0hYNmS6JEjGMEuj9Z4bqzAxZwhQVdUCApaXxb
+giUxw3l+muuGvtwz4eBXDg==
 -----END CERTIFICATE-----
diff --git a/certs/ed25519/client-ed25519.der b/certs/ed25519/client-ed25519.der
index dda0b691a22805c9c910d10602d4af9679c71f43..7f11a86e270699a9b35108afeb43e65c9252b510 100644
GIT binary patch
delta 308
zcmey(a)V9FpouvIh}jk}GchtTiLn2l`h1?Qu9#Hpo<0{JIsTf1(!~a>Y|PrJ1ry&a
zo_Ll+)X>n(#M0O_N}Sio#K6+f49uPQ>LPm+V}L;uqtE1hj0&2K_t}_3WtCYPuNyR8
zX%PA67-!e`NY8DvoqOkmD~Go930~`3*tm2_<D!Xg7S%Ulx0MHEgfI)M0W%}xe*+m1
zPmo2_K)8uJwIVUMASYEXIX}0ZrJjL-(Lfd?tI8r~Ai~C>&Bn;e%FfIPXE8xN!0gBn
zCbs+L63dnp#kHr*R@pO7ug#t9snZ>O?!(8l#^0ap+n7GzdZkeIHkw1@<jRBVo9uW0
VQ(?)A{l0hm?x3@ki{Gwd1OSxqXl(!h

delta 238
zcmcb?_M1h^poys*h&2~5GchtTiBvom|5jh;*jn~uzTMp0b$53Lbz2&+vN3C?7EFAz
zc;Z<OQ3E4m19KzOC~;mR69Y>_Q!sbptBbs)2E_)lY|Npud@N!tlRq$uavR8lxXLUN
z24a)nGm6z3@PPQjjEw(Tm<$*U_&_{<5RZkKiFt*AFo>_p!ehY2#-Yu|$jZvj%mlTY
z*^wdsVP-|>sl>8nZv-@N-C1d<eB63s{FE13xzD~v#fT-$eZFS8t%0L*8IRYeCc{q!
Wt$VAUOO|iW@8F-dcD?S3OPl~1QAuI|

diff --git a/certs/ed25519/client-ed25519.pem b/certs/ed25519/client-ed25519.pem
index ea9df8378..015f7d77f 100644
--- a/certs/ed25519/client-ed25519.pem
+++ b/certs/ed25519/client-ed25519.pem
@@ -2,12 +2,12 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            78:e3:17:f6:7f:7e:41:85:76:f8:9f:3e:9d:db:7e:dd:b9:52:8b:39
+            07:ff:95:e7:9e:2d:2d:16:1a:5d:bc:8e:44:4c:1e:0f:7c:c1:1b:73
         Signature Algorithm: ED25519
         Issuer: C = US, ST = Montana, L = Bozeman, O = wolfSSL_ed25519, OU = Client-ed25519, CN = www.wolfssl.com, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 20 23:07:25 2021 GMT
-            Not After : Sep 15 23:07:25 2024 GMT
+            Not Before: Dec 21 16:49:35 2021 GMT
+            Not After : Sep 16 16:49:35 2024 GMT
         Subject: C = US, ST = Montana, L = Bozeman, O = wolfSSL_ed25519, OU = Client-ed25519, CN = www.wolfssl.com, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: ED25519
@@ -21,31 +21,37 @@ Certificate:
                 FE:41:5E:3E:81:E2:2E:46:B3:3E:47:89:90:D4:C2:B4:8E:11:D6:8A
             X509v3 Authority Key Identifier: 
                 keyid:FE:41:5E:3E:81:E2:2E:46:B3:3E:47:89:90:D4:C2:B4:8E:11:D6:8A
+                DirName:/C=US/ST=Montana/L=Bozeman/O=wolfSSL_ed25519/OU=Client-ed25519/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
+                serial:07:FF:95:E7:9E:2D:2D:16:1A:5D:BC:8E:44:4C:1E:0F:7C:C1:1B:73
 
-            X509v3 Basic Constraints: critical
-                CA:FALSE
-            X509v3 Key Usage: critical
-                Digital Signature, Key Encipherment, Key Agreement
+            X509v3 Basic Constraints: 
+                CA:TRUE
+            X509v3 Subject Alternative Name: 
+                DNS:example.com, IP Address:127.0.0.1
             X509v3 Extended Key Usage: 
-                TLS Web Client Authentication
+                TLS Web Server Authentication, TLS Web Client Authentication
     Signature Algorithm: ED25519
-         5f:e1:69:78:55:ca:61:76:a6:ec:10:29:da:dc:a9:31:23:c7:
-         3b:91:5f:94:e8:2a:6d:e6:f5:5a:5c:16:60:9d:e7:ac:97:3d:
-         30:41:23:76:0c:4a:f2:82:31:f2:70:85:bd:7a:e7:19:77:b3:
-         6f:88:0f:96:ad:af:2d:a8:d2:09
+         56:16:bb:d9:a4:39:84:64:21:ad:ca:36:aa:3f:01:97:7d:6d:
+         9b:49:8b:5b:ce:f0:f1:66:81:fb:f2:3f:86:02:f3:da:ea:20:
+         76:ed:5b:08:28:c9:a9:c1:af:82:3f:bb:fe:24:04:6e:5d:f7:
+         bd:b7:bb:52:cd:79:a3:ed:aa:01
 -----BEGIN CERTIFICATE-----
-MIICdzCCAimgAwIBAgIUeOMX9n9+QYV2+J8+ndt+3blSizkwBQYDK2VwMIGfMQsw
+MIIDVDCCAwagAwIBAgIUB/+V554tLRYaXbyOREweD3zBG3MwBQYDK2VwMIGfMQsw
 CQYDVQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEY
 MBYGA1UECgwPd29sZlNTTF9lZDI1NTE5MRcwFQYDVQQLDA5DbGllbnQtZWQyNTUx
 OTEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZv
-QHdvbGZzc2wuY29tMB4XDTIxMTIyMDIzMDcyNVoXDTI0MDkxNTIzMDcyNVowgZ8x
+QHdvbGZzc2wuY29tMB4XDTIxMTIyMTE2NDkzNVoXDTI0MDkxNjE2NDkzNVowgZ8x
 CzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFu
 MRgwFgYDVQQKDA93b2xmU1NMX2VkMjU1MTkxFzAVBgNVBAsMDkNsaWVudC1lZDI1
 NTE5MRgwFgYDVQQDDA93d3cud29sZnNzbC5jb20xHzAdBgkqhkiG9w0BCQEWEGlu
 Zm9Ad29sZnNzbC5jb20wKjAFBgMrZXADIQDmV1sTG8dRFGvtO/XR+quebLbrAgmj
-mfVuv508/lQ55qN1MHMwHQYDVR0OBBYEFP5BXj6B4i5Gsz5HiZDUwrSOEdaKMB8G
-A1UdIwQYMBaAFP5BXj6B4i5Gsz5HiZDUwrSOEdaKMAwGA1UdEwEB/wQCMAAwDgYD
-VR0PAQH/BAQDAgOoMBMGA1UdJQQMMAoGCCsGAQUFBwMCMAUGAytlcANBAF/haXhV
-ymF2puwQKdrcqTEjxzuRX5ToKm3m9VpcFmCd56yXPTBBI3YMSvKCMfJwhb165xl3
-s2+ID5atry2o0gk=
+mfVuv508/lQ55qOCAVAwggFMMB0GA1UdDgQWBBT+QV4+geIuRrM+R4mQ1MK0jhHW
+ijCB3wYDVR0jBIHXMIHUgBT+QV4+geIuRrM+R4mQ1MK0jhHWiqGBpaSBojCBnzEL
+MAkGA1UEBhMCVVMxEDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4x
+GDAWBgNVBAoMD3dvbGZTU0xfZWQyNTUxOTEXMBUGA1UECwwOQ2xpZW50LWVkMjU1
+MTkxGDAWBgNVBAMMD3d3dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5m
+b0B3b2xmc3NsLmNvbYIUB/+V554tLRYaXbyOREweD3zBG3MwDAYDVR0TBAUwAwEB
+/zAcBgNVHREEFTATggtleGFtcGxlLmNvbYcEfwAAATAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwBQYDK2VwA0EAVha72aQ5hGQhrco2qj8Bl31tm0mLW87w
+8WaB+/I/hgLz2uogdu1bCCjJqcGvgj+7/iQEbl33vbe7Us15o+2qAQ==
 -----END CERTIFICATE-----
diff --git a/certs/ed25519/gen-ed25519-certs.sh b/certs/ed25519/gen-ed25519-certs.sh
index 1e25707ee..b945e49b6 100755
--- a/certs/ed25519/gen-ed25519-certs.sh
+++ b/certs/ed25519/gen-ed25519-certs.sh
@@ -91,7 +91,7 @@ echo ""
 echo -e "US\\nMontana\\nBozeman\\nwolfSSL_ed25519\\nClient-ed25519\\nwww.wolfssl.com\\ninfo@wolfssl.com\\n\\n\\n\\n" | openssl req -new -key client-ed25519-priv.pem -config ../renewcerts/wolfssl.cnf -nodes -out client-ed25519.csr
 check_result $? "Generate request"
 
-openssl x509 -req -in client-ed25519.csr -days 1000 -extfile ../renewcerts/wolfssl.cnf -extensions client_ecc -signkey client-ed25519-priv.pem -out client-ed25519.pem
+openssl x509 -req -in client-ed25519.csr -days 1000 -extfile ../renewcerts/wolfssl.cnf -extensions wolfssl_opts -signkey client-ed25519-priv.pem -out client-ed25519.pem
 check_result $? "Generate certificate"
 rm client-ed25519.csr
 
diff --git a/certs/ed25519/root-ed25519.der b/certs/ed25519/root-ed25519.der
index bf74c6296b89de8ebe016d9192a2065b9b517154..4cb192815793d8cd1fe087389fd5d465e1187458 100644
GIT binary patch
delta 134
zcmaFL@{~o{pou9Fh=mt0GchtTiFnLpO<l$mUF_<Uy?{$1Ja&UYX3|9E4WfpIW+s-#
zrcvU&MkWT9hGt;y#uv7X4s%Qr8xMZTT>d@&mhBahAdA$1iiVQsr!>4TW(saUxLvzD
km(%6n!X<@V%*qxkB(~~x@gMHG<Ww|GBE@!lLq-4x0B8j;8~^|S

delta 134
zcmaFL@{~o{pou9Fh=mt0GchtTiRdmVxgE35@!#*r&RMtpv$n5kx}!Z&d4s5dk+Fff
zk!h4TuaSv?rJ*U9yYYoBqk~xHJ@=xg?{l<{2+9QA=lm#LR5tsS0keYR{iJ0rlGD#e
l7(DyzEwJ?PnmZGI1yr^&W}4S@T`6vnv@qn$op~mP4FDd)H2?qr

diff --git a/certs/ed25519/root-ed25519.pem b/certs/ed25519/root-ed25519.pem
index d52df30eb..72e576ed5 100644
--- a/certs/ed25519/root-ed25519.pem
+++ b/certs/ed25519/root-ed25519.pem
@@ -2,12 +2,12 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            2d:a4:74:db:5c:be:41:fe:fb:59:89:9a:db:4f:6a:b7:ac:82:dc:2b
+            48:99:05:65:a6:02:5b:73:45:4c:6b:a0:0a:18:57:5d:b0:30:69:62
         Signature Algorithm: ED25519
         Issuer: C = US, ST = Montana, L = Bozeman, O = wolfSSL_Ed25519, OU = Root-Ed25519, CN = www.wolfssl.com, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 20 23:07:25 2021 GMT
-            Not After : Sep 15 23:07:25 2024 GMT
+            Not Before: Dec 21 16:49:35 2021 GMT
+            Not After : Sep 16 16:49:35 2024 GMT
         Subject: C = US, ST = Montana, L = Bozeman, O = wolfSSL_Ed25519, OU = Root-Ed25519, CN = www.wolfssl.com, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: ED25519
@@ -27,22 +27,22 @@ Certificate:
             X509v3 Key Usage: critical
                 Digital Signature, Certificate Sign, CRL Sign
     Signature Algorithm: ED25519
-         16:69:de:47:72:e5:ef:6c:2a:c4:11:1c:52:df:09:f1:1b:72:
-         76:9b:ea:30:03:20:41:df:62:a6:84:19:97:cf:58:30:e6:f3:
-         4b:10:a5:c3:ac:dc:90:fa:50:79:85:01:69:37:7c:8a:d4:73:
-         84:19:38:31:0e:6d:99:cc:5c:06
+         9c:34:61:81:c1:f4:69:a7:f7:5f:da:3d:d4:14:52:38:65:50:
+         78:80:74:e7:ca:28:4b:d1:69:11:b7:c1:b7:2b:8b:6d:09:44:
+         fe:a1:a4:71:0a:03:23:38:a8:18:b5:2e:8a:0f:c3:8a:d2:42:
+         72:96:18:64:3d:b7:80:68:50:08
 -----BEGIN CERTIFICATE-----
-MIICYTCCAhOgAwIBAgIULaR021y+Qf77WYma209qt6yC3CswBQYDK2VwMIGdMQsw
+MIICYTCCAhOgAwIBAgIUSJkFZaYCW3NFTGugChhXXbAwaWIwBQYDK2VwMIGdMQsw
 CQYDVQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEY
 MBYGA1UECgwPd29sZlNTTF9FZDI1NTE5MRUwEwYDVQQLDAxSb290LUVkMjU1MTkx
 GDAWBgNVBAMMD3d3dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3
-b2xmc3NsLmNvbTAeFw0yMTEyMjAyMzA3MjVaFw0yNDA5MTUyMzA3MjVaMIGdMQsw
+b2xmc3NsLmNvbTAeFw0yMTEyMjExNjQ5MzVaFw0yNDA5MTYxNjQ5MzVaMIGdMQsw
 CQYDVQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEY
 MBYGA1UECgwPd29sZlNTTF9FZDI1NTE5MRUwEwYDVQQLDAxSb290LUVkMjU1MTkx
 GDAWBgNVBAMMD3d3dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3
 b2xmc3NsLmNvbTAqMAUGAytlcAMhAOmzb3xwiqvKVCBOZHY8Gk/3+l5K//PbuWQt
 EKUMWj/ao2MwYTAdBgNVHQ4EFgQU+rpbdh3xHR1NdEjYmDtW77MU894wHwYDVR0j
 BBgwFoAU+rpbdh3xHR1NdEjYmDtW77MU894wDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAYYwBQYDK2VwA0EAFmneR3Ll72wqxBEcUt8J8RtydpvqMAMgQd9i
-poQZl89YMObzSxClw6zckPpQeYUBaTd8itRzhBk4MQ5tmcxcBg==
+HQ8BAf8EBAMCAYYwBQYDK2VwA0EAnDRhgcH0aaf3X9o91BRSOGVQeIB058ooS9Fp
+EbfBtyuLbQlE/qGkcQoDIzioGLUuig/DitJCcpYYZD23gGhQCA==
 -----END CERTIFICATE-----
diff --git a/certs/ed25519/server-ed25519-cert.pem b/certs/ed25519/server-ed25519-cert.pem
index 101cfeaad..e629875b5 100644
--- a/certs/ed25519/server-ed25519-cert.pem
+++ b/certs/ed25519/server-ed25519-cert.pem
@@ -5,8 +5,8 @@ Certificate:
         Signature Algorithm: ED25519
         Issuer: C = US, ST = Montana, L = Bozeman, O = wolfSSL_ed25519, OU = CA-ed25519, CN = www.wolfssl.com, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 20 23:07:25 2021 GMT
-            Not After : Sep 15 23:07:25 2024 GMT
+            Not Before: Dec 21 16:49:35 2021 GMT
+            Not After : Sep 16 16:49:35 2024 GMT
         Subject: C = US, ST = Montana, L = Bozeman, O = wolfSSL_ed25519, OU = Server-ed25519, CN = www.wolfssl.com, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: ED25519
@@ -30,23 +30,23 @@ Certificate:
             Netscape Cert Type: 
                 SSL Server
     Signature Algorithm: ED25519
-         2a:c7:33:f1:ed:51:63:7b:38:4d:df:45:3d:b1:6a:8a:6e:3e:
-         cc:78:93:cf:84:5d:61:23:62:31:c1:c9:4d:11:6a:83:d5:38:
-         e8:b2:40:a1:62:c9:7b:a4:11:91:04:52:65:86:ab:82:38:20:
-         36:fe:93:59:60:16:65:be:8f:06
+         64:65:b1:5a:3b:18:07:36:42:ea:95:c9:de:96:59:04:cc:65:
+         8a:5a:97:ee:a5:94:06:66:f6:b8:78:68:d1:c1:9f:3f:5c:71:
+         4d:81:1e:80:ec:c2:52:44:b4:1f:d7:90:ad:84:37:a1:dd:c1:
+         f8:ae:fa:c2:92:4f:38:7d:b0:0c
 -----BEGIN CERTIFICATE-----
 MIICdTCCAiegAwIBAgIBATAFBgMrZXAwgZsxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
 DAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRgwFgYDVQQKDA93b2xmU1NMX2Vk
 MjU1MTkxEzARBgNVBAsMCkNBLWVkMjU1MTkxGDAWBgNVBAMMD3d3dy53b2xmc3Ns
-LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAeFw0yMTEyMjAy
-MzA3MjVaFw0yNDA5MTUyMzA3MjVaMIGfMQswCQYDVQQGEwJVUzEQMA4GA1UECAwH
+LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAeFw0yMTEyMjEx
+NjQ5MzVaFw0yNDA5MTYxNjQ5MzVaMIGfMQswCQYDVQQGEwJVUzEQMA4GA1UECAwH
 TW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEYMBYGA1UECgwPd29sZlNTTF9lZDI1
 NTE5MRcwFQYDVQQLDA5TZXJ2ZXItZWQyNTUxOTEYMBYGA1UEAwwPd3d3LndvbGZz
 c2wuY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMCowBQYDK2Vw
 AyEAI6pNYFDgE9M67av2qcxK/tdNL9JbGhAF71pBJc4bU3ijgYkwgYYwHQYDVR0O
 BBYEFKMpgeeQb7lg+K/MFXqu16H0tIa6MB8GA1UdIwQYMBaAFHTVOBleg7kD+AGK
 NTW7iUxJtCPpMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgOoMBMGA1UdJQQM
-MAoGCCsGAQUFBwMBMBEGCWCGSAGG+EIBAQQEAwIGQDAFBgMrZXADQQAqxzPx7VFj
-ezhN30U9sWqKbj7MeJPPhF1hI2IxwclNEWqD1TjoskChYsl7pBGRBFJlhquCOCA2
-/pNZYBZlvo8G
+MAoGCCsGAQUFBwMBMBEGCWCGSAGG+EIBAQQEAwIGQDAFBgMrZXADQQBkZbFaOxgH
+NkLqlcnellkEzGWKWpfupZQGZva4eGjRwZ8/XHFNgR6A7MJSRLQf15CthDeh3cH4
+rvrCkk84fbAM
 -----END CERTIFICATE-----
diff --git a/certs/ed25519/server-ed25519.der b/certs/ed25519/server-ed25519.der
index 470fb8d889b08ec9a74af2456432a2d672488116..117225652352c4cc8948005562b92fa5cfb1ec56 100644
GIT binary patch
delta 106
zcmey#@{?u4J}E;(GZRZ=(<pIXBNGElLo+DXpmF|0DWA<MjG~MVDXANytR>jZoL)^m
zd2d=I%bC=!sOj&PPGL*?wxc5B;=%d$F@?U3at&_|1-WdIzdm7Yi}}L42Y;;lb!d{m
IMePP20Q1=_od5s;

delta 106
zcmey#@{?u4J}CnuV*_&|(<pIXBNGElLsKZ%pmF|0DWA<MjG~MVTE~q)z70&Sw(!00
zYP&J3E6?ss#pLrXv5Cq_h6hjj3T8E5wRo|~VPVqA>Lr2`S%OmARySEFnEjg^nIM+B
Hub&M7%IzrL

diff --git a/certs/ed25519/server-ed25519.pem b/certs/ed25519/server-ed25519.pem
index a9d655aca..3c64693b2 100644
--- a/certs/ed25519/server-ed25519.pem
+++ b/certs/ed25519/server-ed25519.pem
@@ -5,8 +5,8 @@ Certificate:
         Signature Algorithm: ED25519
         Issuer: C = US, ST = Montana, L = Bozeman, O = wolfSSL_ed25519, OU = CA-ed25519, CN = www.wolfssl.com, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 20 23:07:25 2021 GMT
-            Not After : Sep 15 23:07:25 2024 GMT
+            Not Before: Dec 21 16:49:35 2021 GMT
+            Not After : Sep 16 16:49:35 2024 GMT
         Subject: C = US, ST = Montana, L = Bozeman, O = wolfSSL_ed25519, OU = Server-ed25519, CN = www.wolfssl.com, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: ED25519
@@ -30,25 +30,25 @@ Certificate:
             Netscape Cert Type: 
                 SSL Server
     Signature Algorithm: ED25519
-         2a:c7:33:f1:ed:51:63:7b:38:4d:df:45:3d:b1:6a:8a:6e:3e:
-         cc:78:93:cf:84:5d:61:23:62:31:c1:c9:4d:11:6a:83:d5:38:
-         e8:b2:40:a1:62:c9:7b:a4:11:91:04:52:65:86:ab:82:38:20:
-         36:fe:93:59:60:16:65:be:8f:06
+         64:65:b1:5a:3b:18:07:36:42:ea:95:c9:de:96:59:04:cc:65:
+         8a:5a:97:ee:a5:94:06:66:f6:b8:78:68:d1:c1:9f:3f:5c:71:
+         4d:81:1e:80:ec:c2:52:44:b4:1f:d7:90:ad:84:37:a1:dd:c1:
+         f8:ae:fa:c2:92:4f:38:7d:b0:0c
 -----BEGIN CERTIFICATE-----
 MIICdTCCAiegAwIBAgIBATAFBgMrZXAwgZsxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
 DAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRgwFgYDVQQKDA93b2xmU1NMX2Vk
 MjU1MTkxEzARBgNVBAsMCkNBLWVkMjU1MTkxGDAWBgNVBAMMD3d3dy53b2xmc3Ns
-LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAeFw0yMTEyMjAy
-MzA3MjVaFw0yNDA5MTUyMzA3MjVaMIGfMQswCQYDVQQGEwJVUzEQMA4GA1UECAwH
+LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAeFw0yMTEyMjEx
+NjQ5MzVaFw0yNDA5MTYxNjQ5MzVaMIGfMQswCQYDVQQGEwJVUzEQMA4GA1UECAwH
 TW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEYMBYGA1UECgwPd29sZlNTTF9lZDI1
 NTE5MRcwFQYDVQQLDA5TZXJ2ZXItZWQyNTUxOTEYMBYGA1UEAwwPd3d3LndvbGZz
 c2wuY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMCowBQYDK2Vw
 AyEAI6pNYFDgE9M67av2qcxK/tdNL9JbGhAF71pBJc4bU3ijgYkwgYYwHQYDVR0O
 BBYEFKMpgeeQb7lg+K/MFXqu16H0tIa6MB8GA1UdIwQYMBaAFHTVOBleg7kD+AGK
 NTW7iUxJtCPpMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgOoMBMGA1UdJQQM
-MAoGCCsGAQUFBwMBMBEGCWCGSAGG+EIBAQQEAwIGQDAFBgMrZXADQQAqxzPx7VFj
-ezhN30U9sWqKbj7MeJPPhF1hI2IxwclNEWqD1TjoskChYsl7pBGRBFJlhquCOCA2
-/pNZYBZlvo8G
+MAoGCCsGAQUFBwMBMBEGCWCGSAGG+EIBAQQEAwIGQDAFBgMrZXADQQBkZbFaOxgH
+NkLqlcnellkEzGWKWpfupZQGZva4eGjRwZ8/XHFNgR6A7MJSRLQf15CthDeh3cH4
+rvrCkk84fbAM
 -----END CERTIFICATE-----
 Certificate:
     Data:
@@ -57,8 +57,8 @@ Certificate:
         Signature Algorithm: ED25519
         Issuer: C = US, ST = Montana, L = Bozeman, O = wolfSSL_Ed25519, OU = Root-Ed25519, CN = www.wolfssl.com, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 20 23:07:25 2021 GMT
-            Not After : Sep 15 23:07:25 2024 GMT
+            Not Before: Dec 21 16:49:35 2021 GMT
+            Not After : Sep 16 16:49:35 2024 GMT
         Subject: C = US, ST = Montana, L = Bozeman, O = wolfSSL_ed25519, OU = CA-ed25519, CN = www.wolfssl.com, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: ED25519
@@ -78,22 +78,22 @@ Certificate:
             X509v3 Key Usage: critical
                 Digital Signature, Certificate Sign, CRL Sign
     Signature Algorithm: ED25519
-         03:98:e3:5f:c8:d0:65:19:d4:ba:64:a6:df:d9:c5:f5:79:76:
-         ba:9c:e5:b7:a1:12:e3:b9:0b:a5:40:93:ec:c0:96:b7:65:76:
-         1c:9c:4a:e8:62:3e:8b:a3:85:d5:b2:8b:94:ad:69:f9:54:67:
-         ff:7f:09:7c:7c:df:b2:62:5b:0c
+         71:66:ff:a7:fc:b9:fa:03:85:13:28:80:46:5b:22:84:1c:a2:
+         b8:f1:f4:85:83:66:4b:a2:44:8c:63:04:ba:3f:59:e1:ba:b3:
+         03:16:70:85:05:5d:50:20:29:69:7c:5b:82:25:31:c3:79:7e:
+         9a:eb:86:be:dc:33:e1:e0:57:0e
 -----BEGIN CERTIFICATE-----
 MIICTDCCAf6gAwIBAgIBATAFBgMrZXAwgZ0xCzAJBgNVBAYTAlVTMRAwDgYDVQQI
 DAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRgwFgYDVQQKDA93b2xmU1NMX0Vk
 MjU1MTkxFTATBgNVBAsMDFJvb3QtRWQyNTUxOTEYMBYGA1UEAwwPd3d3LndvbGZz
 c2wuY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTIxMTIy
-MDIzMDcyNVoXDTI0MDkxNTIzMDcyNVowgZsxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
+MTE2NDkzNVoXDTI0MDkxNjE2NDkzNVowgZsxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
 DAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRgwFgYDVQQKDA93b2xmU1NMX2Vk
 MjU1MTkxEzARBgNVBAsMCkNBLWVkMjU1MTkxGDAWBgNVBAMMD3d3dy53b2xmc3Ns
 LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAqMAUGAytlcAMh
 AEI7evmCz/nfGd3z8DIpbfr9dk9owsLgbEeuwlVorA1No2MwYTAdBgNVHQ4EFgQU
 dNU4GV6DuQP4AYo1NbuJTEm0I+kwHwYDVR0jBBgwFoAU+rpbdh3xHR1NdEjYmDtW
 77MU894wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwBQYDK2VwA0EA
-A5jjX8jQZRnUumSm39nF9Xl2upzlt6ES47kLpUCT7MCWt2V2HJxK6GI+i6OF1bKL
-lK1p+VRn/38JfHzfsmJbDA==
+cWb/p/y5+gOFEyiARlsihByiuPH0hYNmS6JEjGMEuj9Z4bqzAxZwhQVdUCApaXxb
+giUxw3l+muuGvtwz4eBXDg==
 -----END CERTIFICATE-----
diff --git a/wolfssl/certs_test.h b/wolfssl/certs_test.h
index 538bcd4c9..d2fcfaa73 100644
--- a/wolfssl/certs_test.h
+++ b/wolfssl/certs_test.h
@@ -4690,9 +4690,9 @@ static const unsigned char server_ed25519_cert[] =
         0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F, 0x40,
         0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F,
         0x6D, 0x30, 0x1E, 0x17, 0x0D, 0x32, 0x31, 0x31, 0x32, 0x32,
-        0x30, 0x32, 0x33, 0x30, 0x37, 0x32, 0x35, 0x5A, 0x17, 0x0D,
-        0x32, 0x34, 0x30, 0x39, 0x31, 0x35, 0x32, 0x33, 0x30, 0x37,
-        0x32, 0x35, 0x5A, 0x30, 0x81, 0x9F, 0x31, 0x0B, 0x30, 0x09,
+        0x31, 0x31, 0x36, 0x34, 0x39, 0x33, 0x35, 0x5A, 0x17, 0x0D,
+        0x32, 0x34, 0x30, 0x39, 0x31, 0x36, 0x31, 0x36, 0x34, 0x39,
+        0x33, 0x35, 0x5A, 0x30, 0x81, 0x9F, 0x31, 0x0B, 0x30, 0x09,
         0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31,
         0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x07,
         0x4D, 0x6F, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x31, 0x10, 0x30,
@@ -4727,14 +4727,14 @@ static const unsigned char server_ed25519_cert[] =
         0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01,
         0x30, 0x11, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x86, 0xF8,
         0x42, 0x01, 0x01, 0x04, 0x04, 0x03, 0x02, 0x06, 0x40, 0x30,
-        0x05, 0x06, 0x03, 0x2B, 0x65, 0x70, 0x03, 0x41, 0x00, 0x2A,
-        0xC7, 0x33, 0xF1, 0xED, 0x51, 0x63, 0x7B, 0x38, 0x4D, 0xDF,
-        0x45, 0x3D, 0xB1, 0x6A, 0x8A, 0x6E, 0x3E, 0xCC, 0x78, 0x93,
-        0xCF, 0x84, 0x5D, 0x61, 0x23, 0x62, 0x31, 0xC1, 0xC9, 0x4D,
-        0x11, 0x6A, 0x83, 0xD5, 0x38, 0xE8, 0xB2, 0x40, 0xA1, 0x62,
-        0xC9, 0x7B, 0xA4, 0x11, 0x91, 0x04, 0x52, 0x65, 0x86, 0xAB,
-        0x82, 0x38, 0x20, 0x36, 0xFE, 0x93, 0x59, 0x60, 0x16, 0x65,
-        0xBE, 0x8F, 0x06
+        0x05, 0x06, 0x03, 0x2B, 0x65, 0x70, 0x03, 0x41, 0x00, 0x64,
+        0x65, 0xB1, 0x5A, 0x3B, 0x18, 0x07, 0x36, 0x42, 0xEA, 0x95,
+        0xC9, 0xDE, 0x96, 0x59, 0x04, 0xCC, 0x65, 0x8A, 0x5A, 0x97,
+        0xEE, 0xA5, 0x94, 0x06, 0x66, 0xF6, 0xB8, 0x78, 0x68, 0xD1,
+        0xC1, 0x9F, 0x3F, 0x5C, 0x71, 0x4D, 0x81, 0x1E, 0x80, 0xEC,
+        0xC2, 0x52, 0x44, 0xB4, 0x1F, 0xD7, 0x90, 0xAD, 0x84, 0x37,
+        0xA1, 0xDD, 0xC1, 0xF8, 0xAE, 0xFA, 0xC2, 0x92, 0x4F, 0x38,
+        0x7D, 0xB0, 0x0C
 };
 static const int sizeof_server_ed25519_cert = sizeof(server_ed25519_cert);
 
@@ -4771,9 +4771,9 @@ static const unsigned char ca_ed25519_cert[] =
         0xF7, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66,
         0x6F, 0x40, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E,
         0x63, 0x6F, 0x6D, 0x30, 0x1E, 0x17, 0x0D, 0x32, 0x31, 0x31,
-        0x32, 0x32, 0x30, 0x32, 0x33, 0x30, 0x37, 0x32, 0x35, 0x5A,
-        0x17, 0x0D, 0x32, 0x34, 0x30, 0x39, 0x31, 0x35, 0x32, 0x33,
-        0x30, 0x37, 0x32, 0x35, 0x5A, 0x30, 0x81, 0x9B, 0x31, 0x0B,
+        0x32, 0x32, 0x31, 0x31, 0x36, 0x34, 0x39, 0x33, 0x35, 0x5A,
+        0x17, 0x0D, 0x32, 0x34, 0x30, 0x39, 0x31, 0x36, 0x31, 0x36,
+        0x34, 0x39, 0x33, 0x35, 0x5A, 0x30, 0x81, 0x9B, 0x31, 0x0B,
         0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55,
         0x53, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x08,
         0x0C, 0x07, 0x4D, 0x6F, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x31,
@@ -4804,24 +4804,24 @@ static const unsigned char ca_ed25519_cert[] =
         0x1D, 0x13, 0x01, 0x01, 0xFF, 0x04, 0x05, 0x30, 0x03, 0x01,
         0x01, 0xFF, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x1D, 0x0F, 0x01,
         0x01, 0xFF, 0x04, 0x04, 0x03, 0x02, 0x01, 0x86, 0x30, 0x05,
-        0x06, 0x03, 0x2B, 0x65, 0x70, 0x03, 0x41, 0x00, 0x03, 0x98,
-        0xE3, 0x5F, 0xC8, 0xD0, 0x65, 0x19, 0xD4, 0xBA, 0x64, 0xA6,
-        0xDF, 0xD9, 0xC5, 0xF5, 0x79, 0x76, 0xBA, 0x9C, 0xE5, 0xB7,
-        0xA1, 0x12, 0xE3, 0xB9, 0x0B, 0xA5, 0x40, 0x93, 0xEC, 0xC0,
-        0x96, 0xB7, 0x65, 0x76, 0x1C, 0x9C, 0x4A, 0xE8, 0x62, 0x3E,
-        0x8B, 0xA3, 0x85, 0xD5, 0xB2, 0x8B, 0x94, 0xAD, 0x69, 0xF9,
-        0x54, 0x67, 0xFF, 0x7F, 0x09, 0x7C, 0x7C, 0xDF, 0xB2, 0x62,
-        0x5B, 0x0C
+        0x06, 0x03, 0x2B, 0x65, 0x70, 0x03, 0x41, 0x00, 0x71, 0x66,
+        0xFF, 0xA7, 0xFC, 0xB9, 0xFA, 0x03, 0x85, 0x13, 0x28, 0x80,
+        0x46, 0x5B, 0x22, 0x84, 0x1C, 0xA2, 0xB8, 0xF1, 0xF4, 0x85,
+        0x83, 0x66, 0x4B, 0xA2, 0x44, 0x8C, 0x63, 0x04, 0xBA, 0x3F,
+        0x59, 0xE1, 0xBA, 0xB3, 0x03, 0x16, 0x70, 0x85, 0x05, 0x5D,
+        0x50, 0x20, 0x29, 0x69, 0x7C, 0x5B, 0x82, 0x25, 0x31, 0xC3,
+        0x79, 0x7E, 0x9A, 0xEB, 0x86, 0xBE, 0xDC, 0x33, 0xE1, 0xE0,
+        0x57, 0x0E
 };
 static const int sizeof_ca_ed25519_cert = sizeof(ca_ed25519_cert);
 
 /* ./certs/ed25519/client-ed25519.der, ED25519 */
 static const unsigned char client_ed25519_cert[] =
 {
-        0x30, 0x82, 0x02, 0x77, 0x30, 0x82, 0x02, 0x29, 0xA0, 0x03,
-        0x02, 0x01, 0x02, 0x02, 0x14, 0x78, 0xE3, 0x17, 0xF6, 0x7F,
-        0x7E, 0x41, 0x85, 0x76, 0xF8, 0x9F, 0x3E, 0x9D, 0xDB, 0x7E,
-        0xDD, 0xB9, 0x52, 0x8B, 0x39, 0x30, 0x05, 0x06, 0x03, 0x2B,
+        0x30, 0x82, 0x03, 0x54, 0x30, 0x82, 0x03, 0x06, 0xA0, 0x03,
+        0x02, 0x01, 0x02, 0x02, 0x14, 0x07, 0xFF, 0x95, 0xE7, 0x9E,
+        0x2D, 0x2D, 0x16, 0x1A, 0x5D, 0xBC, 0x8E, 0x44, 0x4C, 0x1E,
+        0x0F, 0x7C, 0xC1, 0x1B, 0x73, 0x30, 0x05, 0x06, 0x03, 0x2B,
         0x65, 0x70, 0x30, 0x81, 0x9F, 0x31, 0x0B, 0x30, 0x09, 0x06,
         0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x10,
         0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x07, 0x4D,
@@ -4839,9 +4839,9 @@ static const unsigned char client_ed25519_cert[] =
         0x86, 0xF7, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E,
         0x66, 0x6F, 0x40, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C,
         0x2E, 0x63, 0x6F, 0x6D, 0x30, 0x1E, 0x17, 0x0D, 0x32, 0x31,
-        0x31, 0x32, 0x32, 0x30, 0x32, 0x33, 0x30, 0x37, 0x32, 0x35,
-        0x5A, 0x17, 0x0D, 0x32, 0x34, 0x30, 0x39, 0x31, 0x35, 0x32,
-        0x33, 0x30, 0x37, 0x32, 0x35, 0x5A, 0x30, 0x81, 0x9F, 0x31,
+        0x31, 0x32, 0x32, 0x31, 0x31, 0x36, 0x34, 0x39, 0x33, 0x35,
+        0x5A, 0x17, 0x0D, 0x32, 0x34, 0x30, 0x39, 0x31, 0x36, 0x31,
+        0x36, 0x34, 0x39, 0x33, 0x35, 0x5A, 0x30, 0x81, 0x9F, 0x31,
         0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02,
         0x55, 0x53, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04,
         0x08, 0x0C, 0x07, 0x4D, 0x6F, 0x6E, 0x74, 0x61, 0x6E, 0x61,
@@ -4862,26 +4862,48 @@ static const unsigned char client_ed25519_cert[] =
         0xE6, 0x57, 0x5B, 0x13, 0x1B, 0xC7, 0x51, 0x14, 0x6B, 0xED,
         0x3B, 0xF5, 0xD1, 0xFA, 0xAB, 0x9E, 0x6C, 0xB6, 0xEB, 0x02,
         0x09, 0xA3, 0x99, 0xF5, 0x6E, 0xBF, 0x9D, 0x3C, 0xFE, 0x54,
-        0x39, 0xE6, 0xA3, 0x75, 0x30, 0x73, 0x30, 0x1D, 0x06, 0x03,
-        0x55, 0x1D, 0x0E, 0x04, 0x16, 0x04, 0x14, 0xFE, 0x41, 0x5E,
+        0x39, 0xE6, 0xA3, 0x82, 0x01, 0x50, 0x30, 0x82, 0x01, 0x4C,
+        0x30, 0x1D, 0x06, 0x03, 0x55, 0x1D, 0x0E, 0x04, 0x16, 0x04,
+        0x14, 0xFE, 0x41, 0x5E, 0x3E, 0x81, 0xE2, 0x2E, 0x46, 0xB3,
+        0x3E, 0x47, 0x89, 0x90, 0xD4, 0xC2, 0xB4, 0x8E, 0x11, 0xD6,
+        0x8A, 0x30, 0x81, 0xDF, 0x06, 0x03, 0x55, 0x1D, 0x23, 0x04,
+        0x81, 0xD7, 0x30, 0x81, 0xD4, 0x80, 0x14, 0xFE, 0x41, 0x5E,
         0x3E, 0x81, 0xE2, 0x2E, 0x46, 0xB3, 0x3E, 0x47, 0x89, 0x90,
-        0xD4, 0xC2, 0xB4, 0x8E, 0x11, 0xD6, 0x8A, 0x30, 0x1F, 0x06,
-        0x03, 0x55, 0x1D, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14,
-        0xFE, 0x41, 0x5E, 0x3E, 0x81, 0xE2, 0x2E, 0x46, 0xB3, 0x3E,
-        0x47, 0x89, 0x90, 0xD4, 0xC2, 0xB4, 0x8E, 0x11, 0xD6, 0x8A,
-        0x30, 0x0C, 0x06, 0x03, 0x55, 0x1D, 0x13, 0x01, 0x01, 0xFF,
-        0x04, 0x02, 0x30, 0x00, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x1D,
-        0x0F, 0x01, 0x01, 0xFF, 0x04, 0x04, 0x03, 0x02, 0x03, 0xA8,
-        0x30, 0x13, 0x06, 0x03, 0x55, 0x1D, 0x25, 0x04, 0x0C, 0x30,
-        0x0A, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03,
-        0x02, 0x30, 0x05, 0x06, 0x03, 0x2B, 0x65, 0x70, 0x03, 0x41,
-        0x00, 0x5F, 0xE1, 0x69, 0x78, 0x55, 0xCA, 0x61, 0x76, 0xA6,
-        0xEC, 0x10, 0x29, 0xDA, 0xDC, 0xA9, 0x31, 0x23, 0xC7, 0x3B,
-        0x91, 0x5F, 0x94, 0xE8, 0x2A, 0x6D, 0xE6, 0xF5, 0x5A, 0x5C,
-        0x16, 0x60, 0x9D, 0xE7, 0xAC, 0x97, 0x3D, 0x30, 0x41, 0x23,
-        0x76, 0x0C, 0x4A, 0xF2, 0x82, 0x31, 0xF2, 0x70, 0x85, 0xBD,
-        0x7A, 0xE7, 0x19, 0x77, 0xB3, 0x6F, 0x88, 0x0F, 0x96, 0xAD,
-        0xAF, 0x2D, 0xA8, 0xD2, 0x09
+        0xD4, 0xC2, 0xB4, 0x8E, 0x11, 0xD6, 0x8A, 0xA1, 0x81, 0xA5,
+        0xA4, 0x81, 0xA2, 0x30, 0x81, 0x9F, 0x31, 0x0B, 0x30, 0x09,
+        0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31,
+        0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x07,
+        0x4D, 0x6F, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x31, 0x10, 0x30,
+        0x0E, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0C, 0x07, 0x42, 0x6F,
+        0x7A, 0x65, 0x6D, 0x61, 0x6E, 0x31, 0x18, 0x30, 0x16, 0x06,
+        0x03, 0x55, 0x04, 0x0A, 0x0C, 0x0F, 0x77, 0x6F, 0x6C, 0x66,
+        0x53, 0x53, 0x4C, 0x5F, 0x65, 0x64, 0x32, 0x35, 0x35, 0x31,
+        0x39, 0x31, 0x17, 0x30, 0x15, 0x06, 0x03, 0x55, 0x04, 0x0B,
+        0x0C, 0x0E, 0x43, 0x6C, 0x69, 0x65, 0x6E, 0x74, 0x2D, 0x65,
+        0x64, 0x32, 0x35, 0x35, 0x31, 0x39, 0x31, 0x18, 0x30, 0x16,
+        0x06, 0x03, 0x55, 0x04, 0x03, 0x0C, 0x0F, 0x77, 0x77, 0x77,
+        0x2E, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63,
+        0x6F, 0x6D, 0x31, 0x1F, 0x30, 0x1D, 0x06, 0x09, 0x2A, 0x86,
+        0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69,
+        0x6E, 0x66, 0x6F, 0x40, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73,
+        0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x14, 0x07, 0xFF, 0x95,
+        0xE7, 0x9E, 0x2D, 0x2D, 0x16, 0x1A, 0x5D, 0xBC, 0x8E, 0x44,
+        0x4C, 0x1E, 0x0F, 0x7C, 0xC1, 0x1B, 0x73, 0x30, 0x0C, 0x06,
+        0x03, 0x55, 0x1D, 0x13, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01,
+        0xFF, 0x30, 0x1C, 0x06, 0x03, 0x55, 0x1D, 0x11, 0x04, 0x15,
+        0x30, 0x13, 0x82, 0x0B, 0x65, 0x78, 0x61, 0x6D, 0x70, 0x6C,
+        0x65, 0x2E, 0x63, 0x6F, 0x6D, 0x87, 0x04, 0x7F, 0x00, 0x00,
+        0x01, 0x30, 0x1D, 0x06, 0x03, 0x55, 0x1D, 0x25, 0x04, 0x16,
+        0x30, 0x14, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07,
+        0x03, 0x01, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07,
+        0x03, 0x02, 0x30, 0x05, 0x06, 0x03, 0x2B, 0x65, 0x70, 0x03,
+        0x41, 0x00, 0x56, 0x16, 0xBB, 0xD9, 0xA4, 0x39, 0x84, 0x64,
+        0x21, 0xAD, 0xCA, 0x36, 0xAA, 0x3F, 0x01, 0x97, 0x7D, 0x6D,
+        0x9B, 0x49, 0x8B, 0x5B, 0xCE, 0xF0, 0xF1, 0x66, 0x81, 0xFB,
+        0xF2, 0x3F, 0x86, 0x02, 0xF3, 0xDA, 0xEA, 0x20, 0x76, 0xED,
+        0x5B, 0x08, 0x28, 0xC9, 0xA9, 0xC1, 0xAF, 0x82, 0x3F, 0xBB,
+        0xFE, 0x24, 0x04, 0x6E, 0x5D, 0xF7, 0xBD, 0xB7, 0xBB, 0x52,
+        0xCD, 0x79, 0xA3, 0xED, 0xAA, 0x01
 };
 static const int sizeof_client_ed25519_cert = sizeof(client_ed25519_cert);