From b472fe297398f60214928cfaedfb9a1192f5a31a Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni@codeaurora.org>
Date: Fri, 4 Oct 2019 16:03:04 +0300
Subject: [PATCH] tests: Update server and user certificates (2019)

The previous versions expired, so need to re-sign these to fix number of
the EAP test cases. This contains updates from running
tests/hwsim/auth_server/update.sh.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
---
 tests/hwsim/auth_serv/index.txt               |   2 +-
 .../auth_serv/ocsp-multi-server-cache.der     | Bin 346 -> 346 bytes
 tests/hwsim/auth_serv/ocsp-req.der            | Bin 76 -> 76 bytes
 tests/hwsim/auth_serv/ocsp-server-cache.der   | Bin 343 -> 343 bytes
 tests/hwsim/auth_serv/server-certpol.pem      |  41 +++++++++---------
 tests/hwsim/auth_serv/server-certpol2.pem     |  36 +++++++--------
 .../auth_serv/server-eku-client-server.pem    |  41 +++++++++---------
 tests/hwsim/auth_serv/server-eku-client.pem   |  41 +++++++++---------
 tests/hwsim/auth_serv/server-extra.pkcs12     | Bin 2426 -> 2426 bytes
 tests/hwsim/auth_serv/server-no-dnsname.pem   |  41 +++++++++---------
 tests/hwsim/auth_serv/server.pem              |  39 +++++++++--------
 tests/hwsim/auth_serv/server.pkcs12           | Bin 1685 -> 1685 bytes
 tests/hwsim/auth_serv/test-ca/index.txt       |   7 +++
 tests/hwsim/auth_serv/test-ca/serial          |   2 +-
 tests/hwsim/auth_serv/user.pem                |  41 +++++++++---------
 tests/hwsim/auth_serv/user.pkcs12             | Bin 1653 -> 1653 bytes
 tests/hwsim/auth_serv/user2.pkcs12            | Bin 2414 -> 2414 bytes
 tests/hwsim/auth_serv/user3.pkcs12            | Bin 2356 -> 2356 bytes
 tests/hwsim/start.sh                          |   2 +-
 tests/hwsim/test_ap_eap.py                    |   2 +-
 20 files changed, 154 insertions(+), 141 deletions(-)

diff --git a/tests/hwsim/auth_serv/index.txt b/tests/hwsim/auth_serv/index.txt
index e61cecf17..7e48c3f81 100644
--- a/tests/hwsim/auth_serv/index.txt
+++ b/tests/hwsim/auth_serv/index.txt
@@ -5,4 +5,4 @@ V	150215083008Z		D8D3E3A6CBE3CCCB	unknown	/C=FI/O=w1.fi/CN=server5.w1.fi
 V	150228224144Z		D8D3E3A6CBE3CCCC	unknown	/C=FI/O=w1.fi/CN=server6.w1.fi
 V	160111185024Z		D8D3E3A6CBE3CCCD	unknown	/C=FI/O=w1.fi/CN=ocsp.w1.fi
 V	150929211300Z		D8D3E3A6CBE3CCD1	unknown	/C=FI/O=w1.fi/CN=Test User
-V	191003221355Z		D8D3E3A6CBE3CD17	unknown	/C=FI/O=w1.fi/CN=server.w1.fi
+V	201003130223Z		D8D3E3A6CBE3CD1F	unknown	/C=FI/O=w1.fi/CN=server.w1.fi
diff --git a/tests/hwsim/auth_serv/ocsp-multi-server-cache.der b/tests/hwsim/auth_serv/ocsp-multi-server-cache.der
index 36be8118aa1d751f02f6112d9a818e73d3d54c73..2e0e88b3bf4fd8e40d6b7b0c86f03099b3b81e7c 100644
GIT binary patch
delta 190
zcmcb`bc<<10=K21fq{vkv4N41@x*M8die$h34S93LnPrS170>xtu~Lg@4SqR+^h`D
zjg1U?w*U1dF5gw%vg+sR|G8Zk<yI^G@QeS^Df3sn>x%gHv&s9LBl*0AG)_yY)~B+~
z)G`;aH|LL$kiF2bX^OD3giF?6n^F<E`!xyOoHzY$JaxX~D?hz^tIT-~&X$Ys&N1ud
nU(sn3StH=ja4Ae){;0!YwHn>~epjxnRDE;u&x=Xxi!K2G|5Qol

delta 190
zcmcb`bc<<10=I>sfq}7+k)g4v>BMZ0dhrGZ34S93LnPrS170>xtu~Lg@4SqR+^h`D
zjg1Uinx6tcX(<2i;#{uUJ4IbS<mSG_ldGEU$gfyC$xZNTp@r_Q%S+nMKC;^-X4P{#
z_Q1)o)Xw-<=FO5F8`{-NKIGlqu39|f%g>zlue?&z%u}EEdj~8k^j@o~k^G(Y^8){g
nN9Np2RL+0BWQ)kf$a&qDM7g9kna(-fB#@mGF>S8xiT+doYW_|k

diff --git a/tests/hwsim/auth_serv/ocsp-req.der b/tests/hwsim/auth_serv/ocsp-req.der
index 3a70e3872d4cc6338889979ae4a5935728912301..92ae0993069398c735a21af7586a91f086411e60 100644
GIT binary patch
delta 6
NcmebAnc&SR4*&*?0h9m$

delta 6
NcmebAnc&SR4gdy(0gM0u

diff --git a/tests/hwsim/auth_serv/ocsp-server-cache.der b/tests/hwsim/auth_serv/ocsp-server-cache.der
index 3d4587922c763d6303b6caf56e0f97324dc6ea04..97696b7a4b5981ae61b6fdec4b98690685f231f2 100644
GIT binary patch
delta 190
zcmcc4be(BJEVrehfq{vkv4N41@x%;|die$h34S93LnPrS170>xtu~Lg@4SqR+^h`D
zjg1U?w*U1dF5gw%vg+sR|G8Zk<yI^G@QeS^Df3sn>x%gHv&s9LBl*0AG)_yY)~B+~
z)G`;aH|LL$kiF2bX^OD3giF?6n^F<E`!xyOoHzY$JaxX~D?hz^tIT-~&X$Ys&N1ud
nU(sn3StH=ja4Ae){;0!YwHn>~epjxnRDE;u&x=Xxi!K2G_PR;h

delta 190
zcmcc4be(BJEVqTBfq}7+k)g4v>BJ0=dhrGZ34S93LnPrS170>xtu~Lg@4SqR+^h`D
zjg1Uinx6tcX(<2i;#{uUJ4IbS<mSG_ldGEU$gfyC$xZNTp@r_Q%S+nMKC;^-X4P{#
z_Q1)o)Xw-<=FO5F8`{-NKIGlqu39|f%g>zlue?&z%u}EEdj~8k^j@o~k^G(Y^8){g
nN9Np2RL+0BWQ)kf$a&qDM7g9kna(-fB#@mGF>S8xiT+doVq{Jg

diff --git a/tests/hwsim/auth_serv/server-certpol.pem b/tests/hwsim/auth_serv/server-certpol.pem
index 5bc0fd1e3..2c8111388 100644
--- a/tests/hwsim/auth_serv/server-certpol.pem
+++ b/tests/hwsim/auth_serv/server-certpol.pem
@@ -1,16 +1,17 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 15624081837803162909 (0xd8d3e3a6cbe3cd1d)
-    Signature Algorithm: sha256WithRSAEncryption
+        Serial Number:
+            d8:d3:e3:a6:cb:e3:cd:23
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=FI, O=w1.fi, CN=Root CA
         Validity
-            Not Before: Jun 11 00:12:34 2019 GMT
-            Not After : Jun 10 00:12:34 2020 GMT
+            Not Before: Oct  4 13:02:23 2019 GMT
+            Not After : Oct  3 13:02:23 2020 GMT
         Subject: C=FI, O=w1.fi, CN=server-policies.w1.fi
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (3072 bit)
+                RSA Public-Key: (3072 bit)
                 Modulus:
                     00:d2:a6:ef:9b:bd:60:63:a1:75:ad:4b:d3:6f:59:
                     5e:84:fa:64:a0:64:24:0b:78:48:fc:8d:66:8b:2f:
@@ -58,18 +59,18 @@ Certificate:
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         ad:cc:03:e6:6b:f0:05:4b:27:41:2a:4d:23:dc:89:76:1d:61:
-         7f:b6:06:fc:48:8b:ce:1a:c2:c4:43:49:6a:41:9b:5e:65:ce:
-         a7:e6:62:df:44:96:3e:0e:d9:26:20:f2:2a:53:5d:35:c8:f7:
-         15:d2:60:29:50:c7:20:50:a1:df:7a:41:cd:1d:a6:3a:e8:3f:
-         5d:1c:38:ed:73:f6:ee:41:ff:8a:54:c4:b5:94:ba:b7:c6:cd:
-         82:c8:c2:7d:dc:4d:27:2f:f1:77:40:20:7c:5a:6b:ce:3e:9d:
-         e5:17:d1:5d:0a:79:66:59:fb:c9:08:cc:24:09:4d:53:ae:4f:
-         fb:c6
+         6d:bc:df:42:16:4b:a1:22:ba:a6:06:f3:70:ce:f7:37:7b:4d:
+         cf:e5:37:cc:5d:e4:b0:6c:09:09:b1:eb:32:3b:54:ab:95:41:
+         ef:6a:0b:d9:ab:0d:23:8f:39:cf:1e:93:a2:f4:65:a6:ae:e2:
+         75:35:63:7b:8f:45:08:e3:00:5a:28:a1:26:e3:19:0f:bf:08:
+         12:2d:c0:7b:72:2a:48:af:a6:a6:82:1d:b5:7a:f3:ac:6e:0b:
+         85:47:7a:54:2c:25:a6:38:68:4d:5c:80:6b:79:0a:70:db:aa:
+         8a:ee:10:61:2c:e5:14:26:e5:52:bc:a9:fc:88:a9:6e:f9:ab:
+         09:cf
 -----BEGIN CERTIFICATE-----
-MIIDxTCCAy6gAwIBAgIJANjT46bL480dMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xOTA2
-MTEwMDEyMzRaFw0yMDA2MTAwMDEyMzRaMD0xCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
+MIIDxTCCAy6gAwIBAgIJANjT46bL480jMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xOTEw
+MDQxMzAyMjNaFw0yMDEwMDMxMzAyMjNaMD0xCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
 DAV3MS5maTEeMBwGA1UEAwwVc2VydmVyLXBvbGljaWVzLncxLmZpMIIBojANBgkq
 hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0qbvm71gY6F1rUvTb1lehPpkoGQkC3hI
 /I1miy9uHUQrrsNtlLrLozS+C05HjVvZmaaoBwmHVbI3fkdnXHRfLIN5sghHtOxP
@@ -84,8 +85,8 @@ BgNVHQ4EFgQUPq0NTX76okrV9THqtrS/g7FVfscwHwYDVR0jBBgwFoAUuJLe/YoY
 szDDn1XzM120yCmKQRQwNQYIKwYBBQUHAQEEKTAnMCUGCCsGAQUFBzABhhlodHRw
 Oi8vc2VydmVyLncxLmZpOjg4ODgvMCAGA1UdEQQZMBeCFXNlcnZlci1wb2xpY2ll
 cy53MS5maTAYBgNVHSAEETAPMA0GCysGAQQBgr5oAQMBMBMGA1UdJQQMMAoGCCsG
-AQUFBwMBMA0GCSqGSIb3DQEBCwUAA4GBAK3MA+Zr8AVLJ0EqTSPciXYdYX+2BvxI
-i84awsRDSWpBm15lzqfmYt9Elj4O2SYg8ipTXTXI9xXSYClQxyBQod96Qc0dpjro
-P10cOO1z9u5B/4pUxLWUurfGzYLIwn3cTScv8XdAIHxaa84+neUX0V0KeWZZ+8kI
-zCQJTVOuT/vG
+AQUFBwMBMA0GCSqGSIb3DQEBCwUAA4GBAG2830IWS6EiuqYG83DO9zd7Tc/lN8xd
+5LBsCQmx6zI7VKuVQe9qC9mrDSOPOc8ek6L0Zaau4nU1Y3uPRQjjAFoooSbjGQ+/
+CBItwHtyKkivpqaCHbV686xuC4VHelQsJaY4aE1cgGt5CnDbqoruEGEs5RQm5VK8
+qfyIqW75qwnP
 -----END CERTIFICATE-----
diff --git a/tests/hwsim/auth_serv/server-certpol2.pem b/tests/hwsim/auth_serv/server-certpol2.pem
index b200b7620..d96af29e1 100644
--- a/tests/hwsim/auth_serv/server-certpol2.pem
+++ b/tests/hwsim/auth_serv/server-certpol2.pem
@@ -2,12 +2,12 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            d8:d3:e3:a6:cb:e3:cd:1e
+            d8:d3:e3:a6:cb:e3:cd:24
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=FI, O=w1.fi, CN=Root CA
         Validity
-            Not Before: Aug 16 12:58:24 2019 GMT
-            Not After : Aug 15 12:58:24 2020 GMT
+            Not Before: Oct  4 13:02:23 2019 GMT
+            Not After : Oct  3 13:02:23 2020 GMT
         Subject: C=FI, O=w1.fi, CN=server-policies2.w1.fi
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -59,18 +59,18 @@ Certificate:
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         89:0d:37:6e:dd:ac:99:70:c3:21:20:ad:00:6e:62:19:a9:d2:
-         eb:0c:af:e7:76:3a:dc:9e:7d:0b:cf:0e:73:48:48:41:4c:53:
-         19:85:14:25:36:32:b4:52:14:ab:3d:0a:eb:ce:0d:0a:66:e5:
-         a5:81:b5:09:90:96:c9:09:49:bd:b4:7a:f3:15:3a:2e:53:2c:
-         8a:62:83:20:72:4e:71:d1:89:ff:41:72:39:a0:a3:98:07:91:
-         a1:72:ef:ef:29:20:66:ce:7d:38:6f:bc:ad:f1:4f:51:26:87:
-         42:05:95:65:ce:27:44:64:86:a5:ed:8b:85:eb:7f:30:ca:07:
-         72:e3
+         2c:96:45:a3:b5:47:2d:b8:0e:f9:e2:d8:5d:a5:0c:99:cb:3f:
+         82:e8:81:2a:ec:c8:82:e2:c4:0a:16:b8:19:87:7d:b8:bb:e8:
+         e6:3c:bc:24:63:f0:82:98:23:1b:eb:39:89:01:b6:d0:e2:e0:
+         53:67:14:a3:34:76:af:ef:4a:7e:50:bb:be:9b:64:14:dc:04:
+         27:08:d2:9e:ef:16:2e:33:c1:fa:8a:29:0b:78:9e:e4:4f:c4:
+         14:8b:cd:fb:cd:98:2c:d9:f9:66:e1:1a:25:80:b9:c7:53:84:
+         80:b6:40:88:09:6a:1f:04:1c:fa:b7:c2:7c:90:8e:bc:da:84:
+         b3:e1
 -----BEGIN CERTIFICATE-----
-MIIDxzCCAzCgAwIBAgIJANjT46bL480eMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xOTA4
-MTYxMjU4MjRaFw0yMDA4MTUxMjU4MjRaMD4xCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
+MIIDxzCCAzCgAwIBAgIJANjT46bL480kMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xOTEw
+MDQxMzAyMjNaFw0yMDEwMDMxMzAyMjNaMD4xCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
 DAV3MS5maTEfMB0GA1UEAwwWc2VydmVyLXBvbGljaWVzMi53MS5maTCCAaIwDQYJ
 KoZIhvcNAQEBBQADggGPADCCAYoCggGBAOZQ0SgFJ2zUQtNCx8xTqWvCo6sgbxc0
 neQdMdDEaGVC1ei9qrjk6fbuLnXNaoz2jqqvbHzrNVBVscKz+KfQHqMzJmhAIBN0
@@ -85,8 +85,8 @@ HQYDVR0OBBYEFE4Bi37Cd5ThaLPEKTUkBQvehEqJMB8GA1UdIwQYMBaAFLiS3v2K
 GLMww59V8zNdtMgpikEUMDUGCCsGAQUFBwEBBCkwJzAlBggrBgEFBQcwAYYZaHR0
 cDovL3NlcnZlci53MS5maTo4ODg4LzAhBgNVHREEGjAYghZzZXJ2ZXItcG9saWNp
 ZXMyLncxLmZpMBgGA1UdIAQRMA8wDQYLKwYBBAGCvmgBAwIwEwYDVR0lBAwwCgYI
-KwYBBQUHAwEwDQYJKoZIhvcNAQELBQADgYEAiQ03bt2smXDDISCtAG5iGanS6wyv
-53Y63J59C88Oc0hIQUxTGYUUJTYytFIUqz0K684NCmblpYG1CZCWyQlJvbR68xU6
-LlMsimKDIHJOcdGJ/0FyOaCjmAeRoXLv7ykgZs59OG+8rfFPUSaHQgWVZc4nRGSG
-pe2Lhet/MMoHcuM=
+KwYBBQUHAwEwDQYJKoZIhvcNAQELBQADgYEALJZFo7VHLbgO+eLYXaUMmcs/guiB
+KuzIguLECha4GYd9uLvo5jy8JGPwgpgjG+s5iQG20OLgU2cUozR2r+9KflC7vptk
+FNwEJwjSnu8WLjPB+oopC3ie5E/EFIvN+82YLNn5ZuEaJYC5x1OEgLZAiAlqHwQc
++rfCfJCOvNqEs+E=
 -----END CERTIFICATE-----
diff --git a/tests/hwsim/auth_serv/server-eku-client-server.pem b/tests/hwsim/auth_serv/server-eku-client-server.pem
index cdf2a51ce..2d299aed4 100644
--- a/tests/hwsim/auth_serv/server-eku-client-server.pem
+++ b/tests/hwsim/auth_serv/server-eku-client-server.pem
@@ -1,16 +1,17 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 15624081837803162906 (0xd8d3e3a6cbe3cd1a)
-    Signature Algorithm: sha256WithRSAEncryption
+        Serial Number:
+            d8:d3:e3:a6:cb:e3:cd:22
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=FI, O=w1.fi, CN=Root CA
         Validity
-            Not Before: Oct  3 22:13:55 2018 GMT
-            Not After : Oct  3 22:13:55 2019 GMT
+            Not Before: Oct  4 13:02:23 2019 GMT
+            Not After : Oct  3 13:02:23 2020 GMT
         Subject: C=FI, O=w1.fi, CN=server6.w1.fi
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                RSA Public-Key: (1024 bit)
                 Modulus:
                     00:ca:30:1e:fd:13:6a:02:28:51:9a:0e:a9:1e:72:
                     7e:e7:5a:c8:cb:0c:7e:8a:99:81:8d:05:b3:09:b0:
@@ -36,18 +37,18 @@ Certificate:
             X509v3 Extended Key Usage: 
                 TLS Web Client Authentication, TLS Web Server Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         6d:25:9d:07:b2:54:61:8a:27:71:bb:94:3f:9d:20:60:41:68:
-         7c:f6:c1:56:c8:22:a4:4c:3c:59:67:3a:db:a3:10:6f:fc:0b:
-         83:81:2b:1a:e3:b9:a4:7b:50:ba:94:fa:43:4d:08:3f:22:f6:
-         a9:ee:92:0b:30:d1:46:e8:d5:05:a5:38:cc:4c:b2:13:8d:a9:
-         9c:7d:7d:26:c8:9c:b4:b2:58:df:87:a7:05:6e:f1:51:93:46:
-         13:77:91:3c:f0:d7:19:02:e9:4a:95:e6:d1:7b:71:22:6d:79:
-         a0:45:94:98:15:bf:be:bd:bb:a7:d2:36:8b:56:4d:7c:2a:cc:
-         07:0a
+         1c:47:3b:a1:09:82:7d:f8:84:e2:b4:0c:26:5b:bb:f2:9a:62:
+         80:ae:8e:fa:c6:4d:4b:83:73:b9:b1:d4:f8:61:5b:bb:ff:00:
+         e4:86:a1:c9:9d:a2:99:e8:70:6b:41:81:4c:12:22:74:60:54:
+         8c:34:e8:01:a3:d5:4d:47:11:ec:39:71:2b:dc:b4:dc:2b:5d:
+         49:df:49:bf:ad:de:e6:e6:6a:76:06:74:a5:50:9c:bc:46:ce:
+         a4:4f:5c:f3:0c:bc:08:c5:f7:a8:aa:bf:4a:60:d6:a1:30:82:
+         6f:94:f1:68:09:0d:d5:94:64:e5:3f:ee:be:5d:ce:5d:91:99:
+         60:c2
 -----BEGIN CERTIFICATE-----
-MIIChzCCAfCgAwIBAgIJANjT46bL480aMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xODEw
-MDMyMjEzNTVaFw0xOTEwMDMyMjEzNTVaMDUxCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
+MIIChzCCAfCgAwIBAgIJANjT46bL480iMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xOTEw
+MDQxMzAyMjNaFw0yMDEwMDMxMzAyMjNaMDUxCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
 DAV3MS5maTEWMBQGA1UEAwwNc2VydmVyNi53MS5maTCBnzANBgkqhkiG9w0BAQEF
 AAOBjQAwgYkCgYEAyjAe/RNqAihRmg6pHnJ+51rIywx+ipmBjQWzCbCphueuRPrg
 x+7zGLQxZeMFb2ZO4+SFgZtHf1+1FiuwWZGcxVXT08osgc7wJ6hU3g5P2PARvQsQ
@@ -55,8 +56,8 @@ Vjgm36k6lRWTphbt0h60tcCoYY6uEAT95ibKSg2QS7msyZTysWuXa2Ak6r0CAwEA
 AaOBpDCBoTAJBgNVHRMEAjAAMB0GA1UdDgQWBBTHxu/1YdKgCIFqa0Qs9XL32t5b
 uTAfBgNVHSMEGDAWgBS4kt79ihizMMOfVfMzXbTIKYpBFDA1BggrBgEFBQcBAQQp
 MCcwJQYIKwYBBQUHMAGGGWh0dHA6Ly9zZXJ2ZXIudzEuZmk6ODg4OC8wHQYDVR0l
-BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4GBAG0lnQey
-VGGKJ3G7lD+dIGBBaHz2wVbIIqRMPFlnOtujEG/8C4OBKxrjuaR7ULqU+kNNCD8i
-9qnukgsw0Ubo1QWlOMxMshONqZx9fSbInLSyWN+HpwVu8VGTRhN3kTzw1xkC6UqV
-5tF7cSJteaBFlJgVv769u6fSNotWTXwqzAcK
+BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4GBABxHO6EJ
+gn34hOK0DCZbu/KaYoCujvrGTUuDc7mx1PhhW7v/AOSGocmdopnocGtBgUwSInRg
+VIw06AGj1U1HEew5cSvctNwrXUnfSb+t3ubmanYGdKVQnLxGzqRPXPMMvAjF96iq
+v0pg1qEwgm+U8WgJDdWUZOU/7r5dzl2RmWDC
 -----END CERTIFICATE-----
diff --git a/tests/hwsim/auth_serv/server-eku-client.pem b/tests/hwsim/auth_serv/server-eku-client.pem
index 17fbaa0bb..5e39ec0c9 100644
--- a/tests/hwsim/auth_serv/server-eku-client.pem
+++ b/tests/hwsim/auth_serv/server-eku-client.pem
@@ -1,16 +1,17 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 15624081837803162905 (0xd8d3e3a6cbe3cd19)
-    Signature Algorithm: sha256WithRSAEncryption
+        Serial Number:
+            d8:d3:e3:a6:cb:e3:cd:21
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=FI, O=w1.fi, CN=Root CA
         Validity
-            Not Before: Oct  3 22:13:55 2018 GMT
-            Not After : Oct  3 22:13:55 2019 GMT
+            Not Before: Oct  4 13:02:23 2019 GMT
+            Not After : Oct  3 13:02:23 2020 GMT
         Subject: C=FI, O=w1.fi, CN=server5.w1.fi
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                RSA Public-Key: (1024 bit)
                 Modulus:
                     00:a3:99:e9:e2:e1:17:60:3b:70:34:1a:74:5c:46:
                     e3:b8:bd:bb:aa:c9:f3:ee:fb:12:30:a0:69:c3:74:
@@ -36,18 +37,18 @@ Certificate:
             X509v3 Extended Key Usage: 
                 TLS Web Client Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         66:75:73:86:b8:50:8d:7a:43:9e:fe:ab:ac:61:39:f8:46:03:
-         86:9d:31:9b:d7:98:e5:1a:a6:4f:f7:5e:bb:1c:dc:a6:6d:c2:
-         f1:1c:a0:00:e3:1c:d0:2f:71:f3:c1:51:83:e5:1c:36:55:de:
-         37:9b:71:26:5f:b3:38:58:34:d7:f8:1a:3f:f5:c6:d3:12:85:
-         cf:73:ac:a4:f0:d0:52:23:e9:95:9e:3e:f8:7e:3a:07:a8:76:
-         68:87:f1:19:79:d7:a3:47:3e:ab:f8:22:34:68:3d:3e:84:6c:
-         d6:4b:be:12:4c:6e:0a:98:20:23:b0:72:f7:f8:33:4f:42:e9:
-         12:9e
+         96:f9:cb:e1:73:60:40:d6:85:d1:ed:a5:14:fc:c1:98:15:2a:
+         bd:02:dd:54:bf:69:ac:9d:b7:af:5c:62:b0:85:32:a2:04:27:
+         d4:98:98:d0:99:53:a9:03:88:33:fa:41:7f:a2:e8:ca:7f:6d:
+         f0:ad:7a:b2:49:1c:be:43:5a:dd:58:1b:bc:32:ae:86:10:00:
+         30:44:f8:44:85:34:dc:fb:05:a3:8a:ab:f4:48:6e:f3:c4:6e:
+         c7:a0:39:82:bd:15:3b:0b:ea:78:10:2d:43:6c:73:c0:60:f8:
+         1c:ad:c1:bf:df:6e:05:b9:db:3f:0c:3e:72:23:bd:56:f6:2a:
+         a5:e6
 -----BEGIN CERTIFICATE-----
-MIICfTCCAeagAwIBAgIJANjT46bL480ZMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xODEw
-MDMyMjEzNTVaFw0xOTEwMDMyMjEzNTVaMDUxCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
+MIICfTCCAeagAwIBAgIJANjT46bL480hMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xOTEw
+MDQxMzAyMjNaFw0yMDEwMDMxMzAyMjNaMDUxCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
 DAV3MS5maTEWMBQGA1UEAwwNc2VydmVyNS53MS5maTCBnzANBgkqhkiG9w0BAQEF
 AAOBjQAwgYkCgYEAo5np4uEXYDtwNBp0XEbjuL27qsnz7vsSMKBpw3Q4gDq6I1LH
 wWrPut1B49JpNaSmYGwxH4W9Vmx7CWPNp1FrhECQd36XaHs4tcQVO3Q3NCi6euLX
@@ -55,8 +56,8 @@ hFN4dk0Wt7jfCXLnhyZ0LATKxc4p9bTO2yjrRUdCj+2IWqMjSZt7vDnhAVMCAwEA
 AaOBmjCBlzAJBgNVHRMEAjAAMB0GA1UdDgQWBBQzFp07FxWCKzRuOOjMIr9Jp14q
 KzAfBgNVHSMEGDAWgBS4kt79ihizMMOfVfMzXbTIKYpBFDA1BggrBgEFBQcBAQQp
 MCcwJQYIKwYBBQUHMAGGGWh0dHA6Ly9zZXJ2ZXIudzEuZmk6ODg4OC8wEwYDVR0l
-BAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADgYEAZnVzhrhQjXpDnv6rrGE5
-+EYDhp0xm9eY5RqmT/deuxzcpm3C8RygAOMc0C9x88FRg+UcNlXeN5txJl+zOFg0
-1/gaP/XG0xKFz3OspPDQUiPplZ4++H46B6h2aIfxGXnXo0c+q/giNGg9PoRs1ku+
-EkxuCpggI7By9/gzT0LpEp4=
+BAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADgYEAlvnL4XNgQNaF0e2lFPzB
+mBUqvQLdVL9prJ23r1xisIUyogQn1JiY0JlTqQOIM/pBf6Loyn9t8K16skkcvkNa
+3VgbvDKuhhAAMET4RIU03PsFo4qr9Ehu88Rux6A5gr0VOwvqeBAtQ2xzwGD4HK3B
+v99uBbnbPww+ciO9VvYqpeY=
 -----END CERTIFICATE-----
diff --git a/tests/hwsim/auth_serv/server-extra.pkcs12 b/tests/hwsim/auth_serv/server-extra.pkcs12
index 822af702ba1d0b87b00b0b91eb37f4ebd6601247..7c963a642a8406d2be7a53aa66c75529d7ae5e98 100644
GIT binary patch
delta 2248
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
Wt-lc^!vqM)-^#&jc;ajV0tf&>RZ4vT

delta 2248
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
Wzu{zUas&v)zLKAbvz%`N0tf(ju0b9E

diff --git a/tests/hwsim/auth_serv/server-no-dnsname.pem b/tests/hwsim/auth_serv/server-no-dnsname.pem
index 44f90f767..432f9b6ea 100644
--- a/tests/hwsim/auth_serv/server-no-dnsname.pem
+++ b/tests/hwsim/auth_serv/server-no-dnsname.pem
@@ -1,16 +1,17 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 15624081837803162904 (0xd8d3e3a6cbe3cd18)
-    Signature Algorithm: sha256WithRSAEncryption
+        Serial Number:
+            d8:d3:e3:a6:cb:e3:cd:20
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=FI, O=w1.fi, CN=Root CA
         Validity
-            Not Before: Oct  3 22:13:55 2018 GMT
-            Not After : Oct  3 22:13:55 2019 GMT
+            Not Before: Oct  4 13:02:23 2019 GMT
+            Not After : Oct  3 13:02:23 2020 GMT
         Subject: C=FI, O=w1.fi, CN=server3.w1.fi
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                RSA Public-Key: (1024 bit)
                 Modulus:
                     00:db:fc:0f:a1:48:87:68:86:c4:9e:7a:f8:18:28:
                     77:6d:a3:58:0f:db:be:6b:d4:43:43:c4:ba:17:37:
@@ -36,18 +37,18 @@ Certificate:
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         06:f7:a9:82:0d:61:44:10:b3:f6:6b:6d:3b:11:49:f5:22:e0:
-         2d:99:a7:df:e1:19:b4:d4:c1:f0:d7:97:8c:c2:db:f5:59:39:
-         cc:bc:3f:c0:bd:f9:7d:97:b5:05:04:8c:1d:7a:10:cf:ac:95:
-         85:7b:ae:b2:da:9b:a6:da:05:c9:a6:68:66:c4:f4:cc:71:4f:
-         85:77:98:2e:a6:96:0f:d0:38:8d:fb:0b:03:9f:3e:89:01:15:
-         9f:0e:73:4b:57:13:5c:f4:05:1c:96:35:be:cc:18:28:e5:d6:
-         eb:93:6a:2f:a9:c5:5e:5a:d0:6d:04:c3:98:e2:b2:d8:f2:c4:
-         8a:64
+         17:8a:95:bc:a7:76:e0:b7:b6:b6:47:5a:41:44:0f:43:76:1f:
+         50:87:f6:64:fe:e9:3a:fb:73:04:df:7b:57:7a:34:ba:ab:bc:
+         ab:d1:18:59:bf:6e:9b:4d:8c:3f:15:65:dd:e9:3c:86:01:69:
+         d5:2b:c3:23:65:9c:07:ef:4a:52:09:c7:3a:68:8e:14:4d:4a:
+         78:23:0c:ec:8d:37:13:2d:ac:ac:6e:d1:f8:5c:a1:1f:50:50:
+         00:fd:ab:e9:f6:ae:f2:c4:78:3c:44:e3:5e:b0:c6:6d:a0:06:
+         98:c9:e2:d1:9a:d7:8b:09:af:f4:10:06:e1:9f:1e:de:d0:c3:
+         b9:1c
 -----BEGIN CERTIFICATE-----
-MIICfTCCAeagAwIBAgIJANjT46bL480YMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xODEw
-MDMyMjEzNTVaFw0xOTEwMDMyMjEzNTVaMDUxCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
+MIICfTCCAeagAwIBAgIJANjT46bL480gMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xOTEw
+MDQxMzAyMjNaFw0yMDEwMDMxMzAyMjNaMDUxCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
 DAV3MS5maTEWMBQGA1UEAwwNc2VydmVyMy53MS5maTCBnzANBgkqhkiG9w0BAQEF
 AAOBjQAwgYkCgYEA2/wPoUiHaIbEnnr4GCh3baNYD9u+a9RDQ8S6FzebqP+WonMU
 ExyuGQ+BVDUQZJTjZGW+mwsW0p6SmHeH4pqZ/B1XDIoNTCEvrmfXY2HrkVtYL61n
@@ -55,8 +56,8 @@ ZmXkgwfKajal5iD2XJkn22PlhtgrfB2QRIEiIXcKAwXD62Nhs0wywIeHOkcCAwEA
 AaOBmjCBlzAJBgNVHRMEAjAAMB0GA1UdDgQWBBSOmk9NRq1ZrH9MnL5tW9eZY43H
 cDAfBgNVHSMEGDAWgBS4kt79ihizMMOfVfMzXbTIKYpBFDA1BggrBgEFBQcBAQQp
 MCcwJQYIKwYBBQUHMAGGGWh0dHA6Ly9zZXJ2ZXIudzEuZmk6ODg4OC8wEwYDVR0l
-BAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADgYEABvepgg1hRBCz9mttOxFJ
-9SLgLZmn3+EZtNTB8NeXjMLb9Vk5zLw/wL35fZe1BQSMHXoQz6yVhXuustqbptoF
-yaZoZsT0zHFPhXeYLqaWD9A4jfsLA58+iQEVnw5zS1cTXPQFHJY1vswYKOXW65Nq
-L6nFXlrQbQTDmOKy2PLEimQ=
+BAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADgYEAF4qVvKd24Le2tkdaQUQP
+Q3YfUIf2ZP7pOvtzBN97V3o0uqu8q9EYWb9um02MPxVl3ek8hgFp1SvDI2WcB+9K
+UgnHOmiOFE1KeCMM7I03Ey2srG7R+FyhH1BQAP2r6fau8sR4PETjXrDGbaAGmMni
+0ZrXiwmv9BAG4Z8e3tDDuRw=
 -----END CERTIFICATE-----
diff --git a/tests/hwsim/auth_serv/server.pem b/tests/hwsim/auth_serv/server.pem
index 93b39b9d5..a8baa17ed 100644
--- a/tests/hwsim/auth_serv/server.pem
+++ b/tests/hwsim/auth_serv/server.pem
@@ -1,16 +1,17 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 15624081837803162903 (0xd8d3e3a6cbe3cd17)
-    Signature Algorithm: sha256WithRSAEncryption
+        Serial Number:
+            d8:d3:e3:a6:cb:e3:cd:1f
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=FI, O=w1.fi, CN=Root CA
         Validity
-            Not Before: Oct  3 22:13:55 2018 GMT
-            Not After : Oct  3 22:13:55 2019 GMT
+            Not Before: Oct  4 13:02:23 2019 GMT
+            Not After : Oct  3 13:02:23 2020 GMT
         Subject: C=FI, O=w1.fi, CN=server.w1.fi
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                RSA Public-Key: (1024 bit)
                 Modulus:
                     00:ba:a0:77:55:22:14:85:55:65:9b:64:2c:ad:ed:
                     9b:dd:65:31:c9:da:60:50:ce:38:d6:34:dc:e8:bc:
@@ -38,18 +39,18 @@ Certificate:
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         b6:98:ae:d9:9b:9a:44:49:b2:06:ee:af:36:83:cb:cd:cb:c9:
-         f3:38:6d:65:cb:e9:81:d2:25:dd:76:12:5c:da:3f:a1:0e:11:
-         a5:04:ed:05:29:2d:66:94:82:a2:80:67:d1:d8:78:71:72:5f:
-         10:c3:51:a2:7b:f5:0b:5f:ec:70:12:99:cb:65:6f:50:7f:2b:
-         05:7c:b4:d7:1b:21:77:66:47:33:f3:a7:d6:fb:ce:97:fe:5f:
-         fd:df:1f:1d:6f:ef:22:5a:c6:78:d2:2b:07:1e:55:ec:80:62:
-         06:7a:be:6a:0d:4d:96:c2:d5:df:76:56:b0:85:6a:f8:a0:27:
-         62:31
+         0b:dc:4c:f7:63:b6:7b:db:79:a9:6b:d3:70:cb:c1:51:30:2d:
+         76:d3:20:6a:95:3a:fe:93:4b:6a:28:86:2f:1c:1c:ea:25:92:
+         b5:86:a8:08:ea:c4:0e:15:e1:b9:fd:b3:f0:d8:5a:bf:58:f7:
+         57:a3:2d:fa:0e:ca:17:e4:42:bc:1d:40:f4:c6:01:76:ea:f3:
+         d3:44:d6:5b:19:1a:24:ba:c2:6e:d9:7b:10:00:f2:2c:37:9a:
+         fb:3e:74:2e:aa:92:b0:db:e0:92:d4:3e:66:89:37:08:71:dd:
+         53:3f:83:6b:74:0e:3e:e5:1e:2f:f1:0f:b0:fb:ed:90:82:b4:
+         d7:ce
 -----BEGIN CERTIFICATE-----
-MIIClTCCAf6gAwIBAgIJANjT46bL480XMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xODEw
-MDMyMjEzNTVaFw0xOTEwMDMyMjEzNTVaMDQxCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
+MIIClTCCAf6gAwIBAgIJANjT46bL480fMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xOTEw
+MDQxMzAyMjNaFw0yMDEwMDMxMzAyMjNaMDQxCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
 DAV3MS5maTEVMBMGA1UEAwwMc2VydmVyLncxLmZpMIGfMA0GCSqGSIb3DQEBAQUA
 A4GNADCBiQKBgQC6oHdVIhSFVWWbZCyt7ZvdZTHJ2mBQzjjWNNzovBueMOcS41Ns
 ye1IA3mBaZjOirh3RzZFz8bg8XsecYlU9wHMIq2gQrGoNZ5gqjqYUdD/H+6+jQpj
@@ -58,7 +59,7 @@ o4GzMIGwMAkGA1UdEwQCMAAwHQYDVR0OBBYEFDFPEFxnn75OiNbcxaueEoiGaQJP
 MB8GA1UdIwQYMBaAFLiS3v2KGLMww59V8zNdtMgpikEUMDUGCCsGAQUFBwEBBCkw
 JzAlBggrBgEFBQcwAYYZaHR0cDovL3NlcnZlci53MS5maTo4ODg4LzAXBgNVHREE
 EDAOggxzZXJ2ZXIudzEuZmkwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcN
-AQELBQADgYEAtpiu2ZuaREmyBu6vNoPLzcvJ8zhtZcvpgdIl3XYSXNo/oQ4RpQTt
-BSktZpSCooBn0dh4cXJfEMNRonv1C1/scBKZy2VvUH8rBXy01xshd2ZHM/On1vvO
-l/5f/d8fHW/vIlrGeNIrBx5V7IBiBnq+ag1NlsLV33ZWsIVq+KAnYjE=
+AQELBQADgYEAC9xM92O2e9t5qWvTcMvBUTAtdtMgapU6/pNLaiiGLxwc6iWStYao
+COrEDhXhuf2z8Nhav1j3V6Mt+g7KF+RCvB1A9MYBdurz00TWWxkaJLrCbtl7EADy
+LDea+z50LqqSsNvgktQ+Zok3CHHdUz+Da3QOPuUeL/EPsPvtkIK0184=
 -----END CERTIFICATE-----
diff --git a/tests/hwsim/auth_serv/server.pkcs12 b/tests/hwsim/auth_serv/server.pkcs12
index ba2516c78b3d4e4ebc04f3fa6b0a032942ac770c..a5b698efa39d596b443970084bd7ca2571aa2f51 100644
GIT binary patch
delta 1545
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

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

diff --git a/tests/hwsim/auth_serv/test-ca/index.txt b/tests/hwsim/auth_serv/test-ca/index.txt
index 0c11f454b..6c94cb66d 100644
--- a/tests/hwsim/auth_serv/test-ca/index.txt
+++ b/tests/hwsim/auth_serv/test-ca/index.txt
@@ -44,3 +44,10 @@ V	191003221355Z		D8D3E3A6CBE3CD1A	unknown	/C=FI/O=w1.fi/CN=server6.w1.fi
 V	191003221355Z		D8D3E3A6CBE3CD1B	unknown	/C=FI/O=w1.fi/CN=Test User
 V	200610001234Z		D8D3E3A6CBE3CD1D	unknown	/C=FI/O=w1.fi/CN=server-policies.w1.fi
 V	200815125824Z		D8D3E3A6CBE3CD1E	unknown	/C=FI/O=w1.fi/CN=server-policies2.w1.fi
+V	201003130223Z		D8D3E3A6CBE3CD1F	unknown	/C=FI/O=w1.fi/CN=server.w1.fi
+V	201003130223Z		D8D3E3A6CBE3CD20	unknown	/C=FI/O=w1.fi/CN=server3.w1.fi
+V	201003130223Z		D8D3E3A6CBE3CD21	unknown	/C=FI/O=w1.fi/CN=server5.w1.fi
+V	201003130223Z		D8D3E3A6CBE3CD22	unknown	/C=FI/O=w1.fi/CN=server6.w1.fi
+V	201003130223Z		D8D3E3A6CBE3CD23	unknown	/C=FI/O=w1.fi/CN=server-policies.w1.fi
+V	201003130223Z		D8D3E3A6CBE3CD24	unknown	/C=FI/O=w1.fi/CN=server-policies2.w1.fi
+V	201003130223Z		D8D3E3A6CBE3CD25	unknown	/C=FI/O=w1.fi/CN=Test User
diff --git a/tests/hwsim/auth_serv/test-ca/serial b/tests/hwsim/auth_serv/test-ca/serial
index 195aecef1..1394bbfd8 100644
--- a/tests/hwsim/auth_serv/test-ca/serial
+++ b/tests/hwsim/auth_serv/test-ca/serial
@@ -1 +1 @@
-D8D3E3A6CBE3CD1F
+D8D3E3A6CBE3CD26
diff --git a/tests/hwsim/auth_serv/user.pem b/tests/hwsim/auth_serv/user.pem
index 6912200db..f0b0962b0 100644
--- a/tests/hwsim/auth_serv/user.pem
+++ b/tests/hwsim/auth_serv/user.pem
@@ -1,16 +1,17 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 15624081837803162907 (0xd8d3e3a6cbe3cd1b)
-    Signature Algorithm: sha256WithRSAEncryption
+        Serial Number:
+            d8:d3:e3:a6:cb:e3:cd:25
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=FI, O=w1.fi, CN=Root CA
         Validity
-            Not Before: Oct  3 22:13:55 2018 GMT
-            Not After : Oct  3 22:13:55 2019 GMT
+            Not Before: Oct  4 13:02:23 2019 GMT
+            Not After : Oct  3 13:02:23 2020 GMT
         Subject: C=FI, O=w1.fi, CN=Test User
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                RSA Public-Key: (1024 bit)
                 Modulus:
                     00:a6:96:2e:9b:22:8c:df:94:be:8b:89:49:f6:78:
                     76:a2:60:7e:14:95:f3:96:fe:ab:19:25:03:34:64:
@@ -36,18 +37,18 @@ Certificate:
             X509v3 Extended Key Usage: 
                 TLS Web Client Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         b3:49:8e:c8:93:0a:80:77:7b:dc:de:29:0d:d6:9b:a3:4c:ae:
-         99:59:8d:37:e0:dd:3f:3a:63:6c:08:b9:74:b7:2c:27:80:b8:
-         ff:6b:c4:0c:60:d7:b9:a2:2c:ab:00:04:43:d8:9d:89:91:43:
-         02:07:c9:96:66:d6:ea:8d:83:ee:d1:62:9b:0d:ab:01:c3:6e:
-         12:2a:a1:b0:9f:2f:f4:dd:45:aa:08:a3:c9:47:9e:5a:05:09:
-         b7:81:3a:b5:d0:e9:56:88:f6:d9:17:6f:62:1e:ab:39:93:df:
-         f2:ad:6a:c2:05:7c:7f:39:2f:19:2a:ab:dd:34:4e:38:37:aa:
-         ee:30
+         98:05:c3:45:76:9e:87:4b:6b:68:56:71:81:6c:3d:99:29:02:
+         6e:00:9d:fd:2b:8a:81:c3:d4:57:f7:43:34:08:df:4a:f0:59:
+         a4:3c:aa:86:a2:e2:06:3f:2c:41:b8:db:aa:e1:25:b3:8f:ab:
+         85:ff:da:de:e4:3c:a6:12:3a:25:27:c5:17:f5:6c:9e:4d:54:
+         36:60:df:f1:95:8f:dd:a6:97:13:ab:9f:d8:39:1f:88:29:3a:
+         90:73:65:08:78:e9:64:b3:c0:34:a2:b4:a9:8e:b7:f9:f8:3f:
+         fb:b6:cb:58:2d:55:2a:57:55:b9:08:c1:6b:b8:f2:25:a2:9a:
+         95:a2
 -----BEGIN CERTIFICATE-----
-MIICeTCCAeKgAwIBAgIJANjT46bL480bMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xODEw
-MDMyMjEzNTVaFw0xOTEwMDMyMjEzNTVaMDExCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
+MIICeTCCAeKgAwIBAgIJANjT46bL480lMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xOTEw
+MDQxMzAyMjNaFw0yMDEwMDMxMzAyMjNaMDExCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
 DAV3MS5maTESMBAGA1UEAwwJVGVzdCBVc2VyMIGfMA0GCSqGSIb3DQEBAQUAA4GN
 ADCBiQKBgQCmli6bIozflL6LiUn2eHaiYH4UlfOW/qsZJQM0ZHQBPqiffPFHYWBM
 gpIofCugDsuHv1nr1/NhIjsU86sx9lqVH7h6uCw8qWFTeJvoPlDswtZE50PNvD5O
@@ -55,8 +56,8 @@ gpIofCugDsuHv1nr1/NhIjsU86sx9lqVH7h6uCw8qWFTeJvoPlDswtZE50PNvD5O
 MIGXMAkGA1UdEwQCMAAwHQYDVR0OBBYEFIHe3+laABrKZ9YG3WWyTsWaBEN9MB8G
 A1UdIwQYMBaAFLiS3v2KGLMww59V8zNdtMgpikEUMDUGCCsGAQUFBwEBBCkwJzAl
 BggrBgEFBQcwAYYZaHR0cDovL3NlcnZlci53MS5maTo4ODg4LzATBgNVHSUEDDAK
-BggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOBgQCzSY7IkwqAd3vc3ikN1pujTK6Z
-WY034N0/OmNsCLl0tywngLj/a8QMYNe5oiyrAARD2J2JkUMCB8mWZtbqjYPu0WKb
-DasBw24SKqGwny/03UWqCKPJR55aBQm3gTq10OlWiPbZF29iHqs5k9/yrWrCBXx/
-OS8ZKqvdNE44N6ruMA==
+BggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOBgQCYBcNFdp6HS2toVnGBbD2ZKQJu
+AJ39K4qBw9RX90M0CN9K8FmkPKqGouIGPyxBuNuq4SWzj6uF/9re5DymEjolJ8UX
+9WyeTVQ2YN/xlY/dppcTq5/YOR+IKTqQc2UIeOlks8A0orSpjrf5+D/7tstYLVUq
+V1W5CMFruPIlopqVog==
 -----END CERTIFICATE-----
diff --git a/tests/hwsim/auth_serv/user.pkcs12 b/tests/hwsim/auth_serv/user.pkcs12
index bd8abd5d4826dd59e9ffdbddf80037a35c81512a..30fd179696476b6cf1e4994635c0376a06be4445 100644
GIT binary patch
delta 1530
zcmV<W1qJ%`4D}3<U4QNjPczfTP$&Wd2mpYB0@&QDK2`P|H&xr5?T=JsZNFQ!9LzB~
zr$D2o$|W*26=W*gi)<t@sAH!H0;Ylit3_)(R0H}T4O84*U-e{JR3RWso9^g_f-fj6
z<wrVEq`pu(*3!DpBguT%F(iAWg!?ceh4K$A$nRK@2}>DLzkj#J<m^Mj7kT29B2a6Z
z42m!LP=FFp$z(hzrDta-^Aj+aYEimRc?MSbNxaMYPM>lDCmuwKv^0Q#h34Z>d9q5C
zLCwv!skm>sXu8$_8F2KqOyJo0A#EeZCk4Twgq0MQ5wEp(;28ZE9POx#tY#%At{e>m
zPpM1E9B_)+-hXlPIl0S%5|c5*y|8ONaYDjxZi*%<*R#OufSwoKYPSje{2I+5Ox^1n
zP*o=5+^NRMsNT2Dxo#{}r$1<iYa@UBh5F3E_G|#Fm{(b&Sw#4<<cO<1^YyKuN^^Xh
zDrv?K+0jl;9R3-|egjN2UR&GH&nEwMaU|bmwSHH?ynmcFi@qk_oZcb@mIAsOe-$!~
zKqiAAlH6_Ur#|ypgVbKvenSxt-J`inp^$3X&`<l#=&_lK;6{vfB3FKeAJ$UsQ$9%d
z_N-9liD7)V7QE0DMfe>rG4ACa=cDZ9sDihHvt0rln!*Y}Wc=-AGcX;iivV+53{yw+
zm<LJUjDMgiCL}j{V2UmW?V-9QkfxY~<v#TdC3{W`V{&u1;}StagVcUPKG&)krydqO
z+!$eqVb}Qe*JYL>HS{(w(`GXKH`@2Uml`CLN^xpXUe?c{&<`oq`=tjajL^d{GJr}@
z9-S1SDfYty3=@hYQEgX!w#}h0HvxIZazxT9RewZL+4jix)7#tc1^k7}<ZZ+kGn`u^
z<I!c&i9p@A?EvO@&xY8^aeqbqv=4BQh-YBd8r*>P^lEb;i%csIX*SSZ4Q7mj6AFw2
z`RBP53tc8I!Bf>Ah&1HXJifF4IFjZ@%VOa#&X97b<ZU4^f&%#l2`Yw2hW8Bt2LYgh
z0+Uw*G=G7p4g<3ZE?xox2ml0v0)PV7WExKo!MIQYTx(kEKfiWz<*WVcZ<gfG%e6d2
z@UTOC69-SP6$nny2(gssty=!a-^WC<>=OdgLN9ht7dS6>1GOw^&(zgDBJMS^O-3;1
z!gOC9$0xtZjfnuz9<5V|Ou6iIZj#BucrJv4%6}pJ>g%Tms=*E73ED>fW!0Iq71$L#
z+`U(pY)nKoVitM^GaH#_{ORC}7Q2Dp>#f3U_u1=oT^e`3v4<|sSM3XI%d!v42UX20
zaO+n0?j$g1%5basYd-IQh@-={c68G+{klUy^`Q>y@i{J0PPFNjnamsIA!*M~dF7k2
z6@LlxBd#NnCZZkVY5@;=6?>4lM%i|UF|{qQ-dVdt)ACgr5}Ny01myy_^7N{ez3j!R
zb5#3asLi?aeKSEP)a0RssduShX2?qOp=y$(>Gx)H!(E7#Hi#GdAhp{B3rUb$E&Rdx
zvgM1TM~zS2TvYBmhU}!$>MJd_r_Xz4Rew=7rdUG>@#*wE$!uEbJu|&mn2)l=I1g1U
zX6hcJgp87Q3)V+eyowuT1Vy{5UV<Jynax4<zGTfSd+{bkXnsh^(QBp;@8a}A01aUl
z->QbSr*^BMuK^QIE5skl6O)k;q9k!Jw-RSUD%Zlf+H85m3S}O%gNP_aI%Zd%et#+$
z^=YZcd@L=n!|C8VZG^lb+Xd>8#JhX;NUPu66kNpPnzBNdGtkd7Y%}+4b~(2HlWf<e
zzIFKYl*cqsd}ln~#2xX2$5c>irwA-h+;{K6ncA)??Ou_z;mZQV5GoyudEsEH;ju;)
zkz|#ZX~^9!mNirY8zC$g35sHi%x|S#nQyPGPr1!xvly`G5Q;hao0&H;B`_lf2`Yw2
zhW8Bt2^BFG1Qdn5&y%H5OUH<Nn>we=n+Wl(sOc~<Fd;Ar1_dh)0|FWa00b1DuXMzk
gwnO{1W@vYK$C6qzv8AyD2<$HXQU517&jJDn0M+E?>;M1&

delta 1530
zcmV<W1qJ%`4D}3<U4PC?(KD4kM8^UG2mpYB0@y0A;G8-~DbvE6@a~@T#OHI#;499=
z9Kq?$*1Qm89Fz)lnP1klaUBN$ZPSn@6~lP7i2x=-p!^9nDz+??{Wn~ckohTLE$vqK
z5QhN<&1psxi<j{Z>3RK=h25RqkWHWr%C&n38F935fm_`nVt<XS2a0&5BdSvX(&Z(Q
zcQ$QlbNGXb*9GQ}j}(0T5%%)6NW3U3z$_Dk#0{H*$eOgM`P8E~XM+ar%|r*y4PG#%
z3j>)nRr8B0UdgZdR9`wO`%2R8Bc`Xjz4bCmi5h%#O)<9!ADvoVxczQ)1C#xY@P(&f
zf3~ZxKv5y$&VR6p@=Zi_(PmPwQa`luG!{FQlR(Bw>e7coZ147n9oS5+XhAODh0do#
z6P0F^QwF)c?3qvM6GNC5v#n=kjI&kA-wNF<=|P|sBul60Si2_DO-2yO)FAS*sy#s3
z-=8^O7b$jF>9`ra^f0h=q}x~_*Oxov;_ss(Eqx`i%712_ohIbIScyf|MiN|Zl9gqK
zG1qG=VkS8Fr8>x1VF&>Qqa5;i?)5D<DBtmPx=~w45d1Y?2C3#K9|-e`=b06O1@DiR
z?n7&tlY2{!uZkHS4v2?H#Lme$AfP4bTxD25e6~ii?;dt!uqo+a*lWbms<lH2d249$
z{wyJX4u8{5#vOdla04YK;=rNvo`1!sFZJ%@uDmv`YP%uz>IdNXc}H77i-z+>=p-2=
zgvYa1j3&qw!9_UZ#Ab8sYoUL%NLMQR_x+Z}q_2hjA~m4#0H?f|rybbNB%u%Q<{slE
zDr#C4WE~5**~p)h1-?k=+hOz8%#DtNE#D(tW`El^)<bsD@N+=M_N_cnZWZkK&cl5F
z78YJr*4x6UH0zp&hgY@WKZ`*WVDZ^*qXt?<6SDqq+CUk)X4@+B{%w*=w(}^u*4KB5
zs%u-zoICv{g&l0AMpu)$l_MP#t-t1Udwu9&p^SMqvld4%f&%#l2`Yw2hW8Bt2LYgh
z0+Uw*G=EKwhpR1{OjH5_2ml0v0)X70;hcyw-6uG8cB~ls;O<cAro#l**T$o}X=KIL
zL+kOkX5{m?-$GV<k!!;60zo894Zgnztf84%U8~a>u=~`~DI}Rr)PlVn3%#*aF#pVb
zCQuI2anfM2Bm>40*K1d|U*VPFI65eqN&g({rGJ*frOZP@Zd^;LY&!~$BD9bAptved
z$!W-|5oIpaL@2t%%k-?kPcDb@={mRx!ZV6V2%ofw$nG_`F10z}CgY(lV~N#|qdALb
zkVr+QW;&D{7woKBi(lWI4er)^M$szTK(p!Ftm?jTE5d3iN$0*7RFXDjI~2L(C`ses
zw0{gD<K(1Ed@AoiUWIJcpvS!?s307p3vW~$LF%>}XjMJRU<+`G*u5iF{sZKvN7U_a
z+Z^Z2W9C|&J)|JC$Xf1~b1xK|{uDnR>!NDNUFG?_Zph8Hyf{_TaTxq8mMC&Ey>kmz
zZJr>_$=sU20?dbI{vp=Gux99DY79nvz<;8>ZE;}jd$ZKA49){=B03<&2%Ox9Bm2(_
zD*Eq5SDm$TN9?w?K-MNbpfd52lO!Awr_AW7x%1jrw=JHv?O+5W4#tGmL!+(D))}a{
z5lluL0WN&*3he1M!>ed9r!^(~Y1XD?H@r%8EDO`<El$SyK*~i&YI!1(eK&<AV}C7N
zZg{OJX5Y3IJ>bU*-BD1TNjAvfy>4qVuQ_$1gv2#zPt=&?R-&@qEl4WK=6%Mp=7k6t
z6_Y5WL8jjqT}DlCr=ys)X7Des<v9?126{Z`ier<)LKv-Hdh?t1k=phaZe50X!p2H{
zp!LX2!CNG&?F=?}lOZ?dI2ut}{cj)aOe3IzjSGEgxY;t-jIOs|nywr%B`_lf2`Yw2
zhW8Bt2^BFG1QgKM<s_wn#V5-@B04@Vl?DfSo&hj1Fd;Ar1_dh)0|FWa00b1c%RuVe
gH7VwECk#KUg&LPy+5kob2r!a%8Yx0ub^-zj0J2@_{r~^~

diff --git a/tests/hwsim/auth_serv/user2.pkcs12 b/tests/hwsim/auth_serv/user2.pkcs12
index de39b79547181c8893e4b912bc1c485e01f6259f..f2eeed8f62eb21f618a1bc00c54382339312f6f4 100644
GIT binary patch
delta 2240
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
O#6%Vmnc*@50tf(G>N)`c

delta 2240
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
O7<uR`bOrGO0tf))S4!Cc

diff --git a/tests/hwsim/auth_serv/user3.pkcs12 b/tests/hwsim/auth_serv/user3.pkcs12
index 3100ca9917e08a066eee491777e44396245769bf..e40af9de44282e17f09fba6881a574485044ecf1 100644
GIT binary patch
delta 2162
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

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

diff --git a/tests/hwsim/start.sh b/tests/hwsim/start.sh
index a8e4da0e7..de2b5f0b5 100755
--- a/tests/hwsim/start.sh
+++ b/tests/hwsim/start.sh
@@ -181,7 +181,7 @@ for i in unknown revoked; do
 done
 
 openssl ocsp -reqout $LOGDIR/ocsp-req.der -issuer $DIR/auth_serv/ca.pem \
-    -sha256 -serial 0xD8D3E3A6CBE3CD17 -no_nonce >> $LOGDIR/ocsp.log 2>&1
+    -sha256 -serial 0xD8D3E3A6CBE3CD1F -no_nonce >> $LOGDIR/ocsp.log 2>&1
 for i in "" "-unknown" "-revoked"; do
     openssl ocsp -index $DIR/auth_serv/index$i.txt \
 	-rsigner $DIR/auth_serv/ca.pem \
diff --git a/tests/hwsim/test_ap_eap.py b/tests/hwsim/test_ap_eap.py
index 04143c4ed..c6e724ad3 100644
--- a/tests/hwsim/test_ap_eap.py
+++ b/tests/hwsim/test_ap_eap.py
@@ -2726,7 +2726,7 @@ def test_ap_wpa2_eap_ttls_server_cert_hash(dev, apdev):
     """WPA2-Enterprise connection using EAP-TTLS and server certificate hash"""
     check_cert_probe_support(dev[0])
     skip_with_fips(dev[0])
-    srv_cert_hash = "4704e62784f36cc5fd964c6410402f4938773bb471dce9d42939bf22fdbdb2dd"
+    srv_cert_hash = "f6b9d0b2bc3f106ff01542161647036992de889267005d93fac1c7274bfca5bb"
     params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
     hapd = hostapd.add_ap(apdev[0], params)
     dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TTLS",