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>

diff --git a/tests/hwsim/auth_serv/index.txt b/tests/hwsim/auth_serv/index.txt
index e61cecf1781478cee4ab76ace7b428ebeece0d65..7e48c3f81930fbe6c08c70eeab5911f586945043 100644 (file)
--- 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 (file)
Binary files a/tests/hwsim/auth_serv/ocsp-multi-server-cache.der and b/tests/hwsim/auth_serv/ocsp-multi-server-cache.der differ

diff --git a/tests/hwsim/auth_serv/ocsp-req.der b/tests/hwsim/auth_serv/ocsp-req.der
index 3a70e3872d4cc6338889979ae4a5935728912301..92ae0993069398c735a21af7586a91f086411e60 100644 (file)
Binary files a/tests/hwsim/auth_serv/ocsp-req.der and b/tests/hwsim/auth_serv/ocsp-req.der differ

diff --git a/tests/hwsim/auth_serv/ocsp-server-cache.der b/tests/hwsim/auth_serv/ocsp-server-cache.der
index 3d4587922c763d6303b6caf56e0f97324dc6ea04..97696b7a4b5981ae61b6fdec4b98690685f231f2 100644 (file)
Binary files a/tests/hwsim/auth_serv/ocsp-server-cache.der and b/tests/hwsim/auth_serv/ocsp-server-cache.der differ

diff --git a/tests/hwsim/auth_serv/server-certpol.pem b/tests/hwsim/auth_serv/server-certpol.pem
index 5bc0fd1e3662fe32947578f86a71252f42afd26a..2c81113883a2039cdd59934e01d4e0b14f5f0470 100644 (file)
--- 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 b200b76208ecb8c38211bf90bcc5ce68c4c80a49..d96af29e1c4f9244fba8f9c5d8ea5cd0f9528a18 100644 (file)
--- 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 cdf2a51ce5b8b0dffdb3868c93767d7fa37f3a85..2d299aed48050cc4c4b3baf38024ef0fdbe55ea0 100644 (file)
--- 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 17fbaa0bb18e864d392230320a1fcf49d1c5dea6..5e39ec0c9cc7e369ad089e3067673ca1d18a4dd4 100644 (file)
--- 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 (file)
Binary files a/tests/hwsim/auth_serv/server-extra.pkcs12 and b/tests/hwsim/auth_serv/server-extra.pkcs12 differ

diff --git a/tests/hwsim/auth_serv/server-no-dnsname.pem b/tests/hwsim/auth_serv/server-no-dnsname.pem
index 44f90f767d51879075028ea5f3c2a58e0d6f97ea..432f9b6ea3041b44974fff51c30c9105d7e47a9b 100644 (file)
--- 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 93b39b9d50278616b237f33dfb630a54c5374f52..a8baa17eddd061047b01f337472e2d4333494480 100644 (file)
--- 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 (file)
Binary files a/tests/hwsim/auth_serv/server.pkcs12 and b/tests/hwsim/auth_serv/server.pkcs12 differ

diff --git a/tests/hwsim/auth_serv/test-ca/index.txt b/tests/hwsim/auth_serv/test-ca/index.txt
index 0c11f454bf98a01291a5267851bf244d7ac96f83..6c94cb66d2b73640917d57d14294ef5fe2cab3bb 100644 (file)
--- 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 195aecef1ee95a9c2bfb87d41de73b9c30e544ee..1394bbfd80ad6785e0dc0acdb83cca285452dfcc 100644 (file)
--- 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 6912200db04de61ba009aace747ed67c7a9e394d..f0b0962b04d610d7a6f03513e48eb8e15d1ffb16 100644 (file)
--- 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 (file)
Binary files a/tests/hwsim/auth_serv/user.pkcs12 and b/tests/hwsim/auth_serv/user.pkcs12 differ

diff --git a/tests/hwsim/auth_serv/user2.pkcs12 b/tests/hwsim/auth_serv/user2.pkcs12
index de39b79547181c8893e4b912bc1c485e01f6259f..f2eeed8f62eb21f618a1bc00c54382339312f6f4 100644 (file)
Binary files a/tests/hwsim/auth_serv/user2.pkcs12 and b/tests/hwsim/auth_serv/user2.pkcs12 differ

diff --git a/tests/hwsim/auth_serv/user3.pkcs12 b/tests/hwsim/auth_serv/user3.pkcs12
index 3100ca9917e08a066eee491777e44396245769bf..e40af9de44282e17f09fba6881a574485044ecf1 100644 (file)
Binary files a/tests/hwsim/auth_serv/user3.pkcs12 and b/tests/hwsim/auth_serv/user3.pkcs12 differ

diff --git a/tests/hwsim/start.sh b/tests/hwsim/start.sh
index a8e4da0e7f4a101e0b45f8141e100c7311719a9d..de2b5f0b5a4daeb9edbedff3d3adf850c3c23dfd 100755 (executable)
--- 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 04143c4ed2127249d11b9fbfed66801c3983a652..c6e724ad3f32c8cca23c2ce999d9b37b87bd9426 100644 (file)
--- 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",