diff --git a/tests/hwsim/auth_serv/index.txt b/tests/hwsim/auth_serv/index.txt index 6a83b625c..2d7d4d9d2 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 230416101938Z D8D3E3A6CBE3CD73 unknown /C=FI/O=w1.fi/CN=server.w1.fi +V 240417080242Z D8D3E3A6CBE3CD7D 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 3ce8511e3..1f295845b 100644 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 b3fa69bc0..02f72c482 100644 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-responder.pem b/tests/hwsim/auth_serv/ocsp-responder.pem index 755469e89..fd5bec978 100644 --- a/tests/hwsim/auth_serv/ocsp-responder.pem +++ b/tests/hwsim/auth_serv/ocsp-responder.pem @@ -2,16 +2,16 @@ Certificate: Data: Version: 3 (0x2) Serial Number: - d8:d3:e3:a6:cb:e3:cd:7c + d8:d3:e3:a6:cb:e3:cd:86 Signature Algorithm: sha256WithRSAEncryption Issuer: C=FI, L=Tuusula, O=w1.fi, CN=Root CA Validity - Not Before: Apr 16 10:19:38 2022 GMT - Not After : Apr 16 10:19:38 2023 GMT + Not Before: Apr 18 08:02:42 2023 GMT + Not After : Apr 17 08:02:42 2024 GMT Subject: C=FI, O=w1.fi, CN=ocsp.w1.fi Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:a7:22:85:5d:bb:3b:1c:02:9a:01:73:aa:88:63: 6e:a1:43:33:b5:fd:02:fe:1f:c8:23:04:8b:8c:51: @@ -39,26 +39,31 @@ Certificate: Digital Signature, Non Repudiation, Key Encipherment X509v3 Extended Key Usage: OCSP Signing + X509v3 Subject Key Identifier: + 2D:D5:2E:6F:1C:49:B1:7C:C9:A1:0C:66:32:35:AB:A8:96:F8:21:A2 + X509v3 Authority Key Identifier: + A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 Signature Algorithm: sha256WithRSAEncryption - 4d:72:4a:e9:61:33:7a:13:31:42:cc:42:3c:da:02:1e:95:2f: - 05:e4:94:22:55:5a:67:55:fa:e6:ec:e5:01:8f:bc:d3:80:0d: - b0:b5:7c:2e:87:f1:49:92:22:04:ba:8b:cd:94:9a:18:10:34: - 0e:b0:3b:e4:f1:81:6e:85:73:8c:90:09:62:1f:55:42:64:1d: - 7e:b5:55:ef:11:26:5a:62:24:bd:be:14:f3:4e:69:ee:5b:8e: - 5b:e0:49:cd:91:8e:62:e7:a2:25:a3:36:c8:69:b1:a4:00:3b: - e2:55:f1:03:52:44:c5:d5:0b:24:4b:3e:5c:22:b9:ad:02:8f: - 1d:a0:be:da:6c:c7:08:bd:63:11:d4:5b:20:2e:8a:7d:cc:43: - 1e:81:0a:bf:2f:40:f5:99:61:46:5a:50:49:bb:17:a9:ed:73: - 4c:20:3c:3f:b9:4f:1f:94:2a:cd:a1:e3:84:ca:d0:d0:a5:b7: - 81:ba:f2:af:e4:54:28:88:48:67:86:38:4a:6b:7c:a7:a0:5e: - c2:39:3b:3e:a6:c4:eb:b8:07:d3:65:d1:d0:65:17:8e:60:80: - df:df:3e:25:0c:07:bd:1d:a4:c1:df:c8:29:07:ba:e8:fd:d4: - 57:cc:16:0a:b2:b8:ee:93:68:41:47:fe:55:53:a1:a0:bd:a4: - 14:a6:a6:2d + Signature Value: + 2d:31:e5:de:71:74:09:ad:c2:7e:58:a1:c9:71:69:4c:8e:19: + 4b:31:e6:09:c2:e9:6a:67:ec:89:94:a8:b2:84:6f:6c:d0:69: + fd:64:12:42:6d:a0:be:1a:7c:e4:71:53:c9:11:3a:02:b2:a7: + ad:78:ee:ea:7e:85:da:ff:91:dd:9c:20:ad:68:7b:81:d7:c4: + b4:d5:b1:fa:8e:c1:d8:e4:db:77:01:19:28:16:df:13:83:ce: + 94:fe:6d:90:75:2b:9d:ed:29:00:16:0e:a3:6b:68:ba:7e:d2: + 49:97:dd:af:0f:63:8f:d2:c7:f1:1e:49:e7:06:84:81:30:4e: + 15:b5:40:dc:50:64:b6:05:3e:3d:0f:66:24:30:2f:06:b2:a2: + 46:c7:fc:21:d7:d6:a2:12:1c:10:44:8c:56:b3:26:56:0e:0d: + b7:e8:c4:8f:6c:8d:d1:79:b9:2e:04:71:ed:aa:36:f6:e3:4a: + f9:47:c5:72:fb:92:f5:15:bf:8d:c3:7f:51:75:9b:21:cc:7c: + 5f:2a:ef:d4:db:e5:50:cc:34:7c:26:78:0b:ac:ae:ef:77:6c: + 3f:ce:f8:46:1c:1f:7a:04:51:9b:55:2f:fb:b0:cc:20:85:f1: + 34:22:2c:a5:1f:1a:83:eb:a7:58:6f:f6:6b:da:2b:14:6a:91: + b4:f6:a7:25 -----BEGIN CERTIFICATE----- -MIIDJTCCAg2gAwIBAgIJANjT46bL4818MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV +MIIDZTCCAk2gAwIBAgIJANjT46bL482GMA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV BAYTAkZJMRAwDgYDVQQHDAdUdXVzdWxhMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UE -AwwHUm9vdCBDQTAeFw0yMjA0MTYxMDE5MzhaFw0yMzA0MTYxMDE5MzhaMDIxCzAJ +AwwHUm9vdCBDQTAeFw0yMzA0MTgwODAyNDJaFw0yNDA0MTcwODAyNDJaMDIxCzAJ BgNVBAYTAkZJMQ4wDAYDVQQKDAV3MS5maTETMBEGA1UEAwwKb2NzcC53MS5maTCC ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKcihV27OxwCmgFzqohjbqFD M7X9Av4fyCMEi4xRUlvgzGJgKqq6iE9BOWv7NMCiencu4Vae78quZ9X5i1+rrofh @@ -66,11 +71,13 @@ sBQjA61pS98rkXB1zb9lQBLQ6y+J8EEVG+1MDTqSlpH4zVQ4FetrRZ9ShX5OFatO S+siwl2+/zZvQifYS8bhvvgIz6z9UTCi6IATAAW2BVVCC/oeQIRQCYwlNVQlRTmf TnwK2cRKDBZOPmh/G63JUwhcuATU1pNi/a/5tB30lj6bnRRtHGwjrj3HtM8xkCBq gJliflzp1dW9WU2j2dzp++h7ZYfV+Umevg7zqSHelOhU/IDP2uOPmsZMdhgO/qsC -AwEAAaMvMC0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwEwYDVR0lBAwwCgYIKwYB -BQUHAwkwDQYJKoZIhvcNAQELBQADggEBAE1ySulhM3oTMULMQjzaAh6VLwXklCJV -WmdV+ubs5QGPvNOADbC1fC6H8UmSIgS6i82UmhgQNA6wO+TxgW6Fc4yQCWIfVUJk -HX61Ve8RJlpiJL2+FPNOae5bjlvgSc2RjmLnoiWjNshpsaQAO+JV8QNSRMXVCyRL -Plwiua0Cjx2gvtpsxwi9YxHUWyAuin3MQx6BCr8vQPWZYUZaUEm7F6ntc0wgPD+5 -Tx+UKs2h44TK0NClt4G68q/kVCiISGeGOEprfKegXsI5Oz6mxOu4B9Nl0dBlF45g -gN/fPiUMB70dpMHfyCkHuuj91FfMFgqyuO6TaEFH/lVToaC9pBSmpi0= +AwEAAaNvMG0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwEwYDVR0lBAwwCgYIKwYB +BQUHAwkwHQYDVR0OBBYEFC3VLm8cSbF8yaEMZjI1q6iW+CGiMB8GA1UdIwQYMBaA +FKT9uTkbgbOq64gd1IGptRFwzKfhMA0GCSqGSIb3DQEBCwUAA4IBAQAtMeXecXQJ +rcJ+WKHJcWlMjhlLMeYJwulqZ+yJlKiyhG9s0Gn9ZBJCbaC+GnzkcVPJEToCsqet +eO7qfoXa/5HdnCCtaHuB18S01bH6jsHY5Nt3ARkoFt8Tg86U/m2QdSud7SkAFg6j +a2i6ftJJl92vD2OP0sfxHknnBoSBME4VtUDcUGS2BT49D2YkMC8GsqJGx/wh19ai +EhwQRIxWsyZWDg236MSPbI3RebkuBHHtqjb240r5R8Vy+5L1Fb+Nw39RdZshzHxf +Ku/U2+VQzDR8JngLrK7vd2w/zvhGHB96BFGbVS/7sMwghfE0IiylHxqD66dYb/Zr +2isUapG09qcl -----END CERTIFICATE----- diff --git a/tests/hwsim/auth_serv/ocsp-server-cache.der b/tests/hwsim/auth_serv/ocsp-server-cache.der index 27d581f22..33792d216 100644 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 1073238e6..9b258b04a 100644 --- a/tests/hwsim/auth_serv/server-certpol.pem +++ b/tests/hwsim/auth_serv/server-certpol.pem @@ -2,16 +2,16 @@ Certificate: Data: Version: 3 (0x2) Serial Number: - d8:d3:e3:a6:cb:e3:cd:79 + d8:d3:e3:a6:cb:e3:cd:83 Signature Algorithm: sha256WithRSAEncryption Issuer: C=FI, L=Tuusula, O=w1.fi, CN=Root CA Validity - Not Before: Apr 16 10:19:38 2022 GMT - Not After : Apr 16 10:19:38 2023 GMT + Not Before: Apr 18 08:02:42 2023 GMT + Not After : Apr 17 08:02:42 2024 GMT Subject: C=FI, O=w1.fi, CN=server-policies.w1.fi Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (3072 bit) + 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: @@ -46,38 +46,36 @@ Certificate: X509v3 Subject Key Identifier: 3E:AD:0D:4D:7E:FA:A2:4A:D5:F5:31:EA:B6:B4:BF:83:B1:55:7E:C7 X509v3 Authority Key Identifier: - keyid:A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 - + A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 Authority Information Access: OCSP - URI:http://server.w1.fi:8888/ - X509v3 Subject Alternative Name: DNS:server-policies.w1.fi X509v3 Certificate Policies: Policy: 1.3.6.1.4.1.40808.1.3.1 - X509v3 Extended Key Usage: TLS Web Server Authentication Signature Algorithm: sha256WithRSAEncryption - 2b:96:90:21:27:2c:ef:7e:ab:68:16:6a:76:57:f0:cf:c7:f1: - 17:c0:1b:b8:8a:7c:f6:4d:4b:02:aa:5b:3f:90:1e:6d:55:69: - 92:84:1e:53:de:ab:59:60:36:f3:bc:07:c3:b7:d1:2c:6f:e6: - c7:d8:45:f7:37:56:47:b2:60:22:a5:3a:6e:cd:c0:4b:8c:bd: - 05:bd:85:84:6e:8f:b7:6a:86:70:d0:9a:3f:cc:af:b7:51:e6: - 8e:39:f4:5a:d9:ee:e4:6a:a1:45:1b:64:ff:1e:32:eb:ec:d7: - 2f:ef:0b:67:9e:b7:69:4e:de:9d:07:c7:f3:b8:96:15:d2:7f: - e3:3c:9a:4a:f3:a4:56:dd:bb:b3:d2:73:11:54:99:f3:7a:4f: - fd:15:1a:c2:7d:f9:f5:33:67:64:af:a0:3f:9c:c5:5a:f0:c6: - 9c:d8:07:d6:07:3d:b8:5b:d1:7c:ae:e2:9f:af:66:fa:ec:05: - b6:cc:ed:a7:71:52:8d:5f:4b:03:1e:db:ab:ae:12:6a:a7:d9: - 39:5d:02:09:cc:21:47:e0:66:33:c5:49:23:96:25:c3:ea:d0: - a0:77:e6:23:e7:a1:95:06:c9:0f:25:41:b5:da:16:ef:f5:08: - 10:1d:57:81:96:1d:3c:13:ea:44:7e:19:60:85:a8:da:26:cc: - b3:42:7d:aa + Signature Value: + ab:a4:22:3b:c9:e9:9e:54:56:a2:0c:48:fa:9b:90:d0:0d:40: + af:ec:ce:ca:22:04:6c:32:20:bb:51:4a:30:fd:4b:72:9d:e3: + ce:f3:f2:f4:d0:85:ac:cb:9e:6c:1b:19:cb:8a:62:b9:9f:a3: + f0:3e:2d:0d:a3:85:03:20:fb:44:40:f9:b3:2d:13:fa:19:d2: + a1:96:ea:03:79:1f:99:48:d4:78:58:2e:05:64:dd:9f:c1:cd: + 25:c6:fe:77:9b:78:44:7a:9f:93:9e:51:a3:01:f0:8f:d5:99: + c4:2a:fe:38:c5:19:f5:9f:10:fa:7b:4a:9e:b7:b3:64:93:b7: + 24:b6:12:ab:9c:9c:86:74:2a:52:80:ce:84:b2:6c:af:ff:a6: + 80:d0:c0:70:79:d3:2e:89:02:25:5f:53:f2:cb:db:2a:33:4c: + 14:b0:78:51:26:18:99:bc:8c:92:17:9b:9f:56:e8:12:92:b9: + 75:60:2e:b5:c0:88:22:97:9f:ea:25:13:dd:3e:34:cf:7c:70: + 02:58:67:36:3d:0d:5d:b2:e2:5c:6e:7f:e8:42:8e:b1:f7:5e: + 79:2a:37:9e:9c:64:ea:2a:2f:8d:e8:91:c6:d7:70:6c:f0:a2: + af:8a:a9:cb:e2:89:f0:31:c3:29:62:be:86:5e:db:84:5e:ab: + 50:25:da:c9 -----BEGIN CERTIFICATE----- -MIIEWDCCA0CgAwIBAgIJANjT46bL4815MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV +MIIEWDCCA0CgAwIBAgIJANjT46bL482DMA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV BAYTAkZJMRAwDgYDVQQHDAdUdXVzdWxhMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UE -AwwHUm9vdCBDQTAeFw0yMjA0MTYxMDE5MzhaFw0yMzA0MTYxMDE5MzhaMD0xCzAJ +AwwHUm9vdCBDQTAeFw0yMzA0MTgwODAyNDJaFw0yNDA0MTcwODAyNDJaMD0xCzAJ BgNVBAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEeMBwGA1UEAwwVc2VydmVyLXBvbGlj aWVzLncxLmZpMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA0qbvm71g Y6F1rUvTb1lehPpkoGQkC3hI/I1miy9uHUQrrsNtlLrLozS+C05HjVvZmaaoBwmH @@ -92,11 +90,11 @@ gdYwgdMwCQYDVR0TBAIwADAdBgNVHQ4EFgQUPq0NTX76okrV9THqtrS/g7FVfscw HwYDVR0jBBgwFoAUpP25ORuBs6rriB3Ugam1EXDMp+EwNQYIKwYBBQUHAQEEKTAn MCUGCCsGAQUFBzABhhlodHRwOi8vc2VydmVyLncxLmZpOjg4ODgvMCAGA1UdEQQZ MBeCFXNlcnZlci1wb2xpY2llcy53MS5maTAYBgNVHSAEETAPMA0GCysGAQQBgr5o -AQMBMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQArlpAh -JyzvfqtoFmp2V/DPx/EXwBu4inz2TUsCqls/kB5tVWmShB5T3qtZYDbzvAfDt9Es -b+bH2EX3N1ZHsmAipTpuzcBLjL0FvYWEbo+3aoZw0Jo/zK+3UeaOOfRa2e7kaqFF -G2T/HjLr7Ncv7wtnnrdpTt6dB8fzuJYV0n/jPJpK86RW3buz0nMRVJnzek/9FRrC -ffn1M2dkr6A/nMVa8Mac2AfWBz24W9F8ruKfr2b67AW2zO2ncVKNX0sDHturrhJq -p9k5XQIJzCFH4GYzxUkjliXD6tCgd+Yj56GVBskPJUG12hbv9QgQHVeBlh08E+pE -fhlghajaJsyzQn2q +AQMBMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCrpCI7 +yemeVFaiDEj6m5DQDUCv7M7KIgRsMiC7UUow/UtynePO8/L00IWsy55sGxnLimK5 +n6PwPi0No4UDIPtEQPmzLRP6GdKhluoDeR+ZSNR4WC4FZN2fwc0lxv53m3hEep+T +nlGjAfCP1ZnEKv44xRn1nxD6e0qet7Nkk7ckthKrnJyGdCpSgM6Esmyv/6aA0MBw +edMuiQIlX1Pyy9sqM0wUsHhRJhiZvIySF5ufVugSkrl1YC61wIgil5/qJRPdPjTP +fHACWGc2PQ1dsuJcbn/oQo6x9155KjeenGTqKi+N6JHG13Bs8KKviqnL4onwMcMp +Yr6GXtuEXqtQJdrJ -----END CERTIFICATE----- diff --git a/tests/hwsim/auth_serv/server-certpol2.pem b/tests/hwsim/auth_serv/server-certpol2.pem index 5539a6e8b..d7c8da000 100644 --- a/tests/hwsim/auth_serv/server-certpol2.pem +++ b/tests/hwsim/auth_serv/server-certpol2.pem @@ -2,16 +2,16 @@ Certificate: Data: Version: 3 (0x2) Serial Number: - d8:d3:e3:a6:cb:e3:cd:7a + d8:d3:e3:a6:cb:e3:cd:84 Signature Algorithm: sha256WithRSAEncryption Issuer: C=FI, L=Tuusula, O=w1.fi, CN=Root CA Validity - Not Before: Apr 16 10:19:38 2022 GMT - Not After : Apr 16 10:19:38 2023 GMT + Not Before: Apr 18 08:02:42 2023 GMT + Not After : Apr 17 08:02:42 2024 GMT Subject: C=FI, O=w1.fi, CN=server-policies2.w1.fi Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (3072 bit) + Public-Key: (3072 bit) Modulus: 00:e6:50:d1:28:05:27:6c:d4:42:d3:42:c7:cc:53: a9:6b:c2:a3:ab:20:6f:17:34:9d:e4:1d:31:d0:c4: @@ -46,38 +46,36 @@ Certificate: X509v3 Subject Key Identifier: 4E:01:8B:7E:C2:77:94:E1:68:B3:C4:29:35:24:05:0B:DE:84:4A:89 X509v3 Authority Key Identifier: - keyid:A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 - + A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 Authority Information Access: OCSP - URI:http://server.w1.fi:8888/ - X509v3 Subject Alternative Name: DNS:server-policies2.w1.fi X509v3 Certificate Policies: Policy: 1.3.6.1.4.1.40808.1.3.2 - X509v3 Extended Key Usage: TLS Web Server Authentication Signature Algorithm: sha256WithRSAEncryption - 27:09:c0:49:ae:d3:96:f9:64:70:4b:04:16:ce:d0:8c:5f:93: - e5:9b:7c:d9:58:38:28:83:fa:f9:75:67:2a:9d:8d:7f:b6:b8: - 61:f5:d7:17:a1:b2:aa:ab:11:79:b2:65:93:40:1b:cf:32:76: - 50:26:72:d1:98:c8:4f:24:d9:8a:49:c6:43:eb:83:a0:4b:8d: - 05:56:55:5a:99:3b:63:c1:98:ea:9e:e6:19:0f:d4:1d:e2:03: - 78:c2:9e:53:a5:67:6a:7e:2a:b4:3e:18:fa:27:a6:f5:74:bd: - 5e:ed:74:46:35:07:a0:46:97:45:3e:1e:98:ef:c0:5d:5d:63: - 96:9f:dc:6c:34:e1:73:83:4a:cd:1b:da:dd:81:d9:ec:2b:68: - e6:21:fe:af:c9:08:2b:4d:f7:aa:88:11:4b:64:bf:95:c4:72: - 1b:89:2b:9f:d6:bb:bd:9b:a8:79:28:ec:d3:4d:34:c0:ce:9f: - 9f:24:d7:ac:4f:8f:85:2c:b1:79:7b:d2:86:56:3c:48:6a:fb: - c1:4a:74:13:b7:60:27:f6:d2:34:72:f9:3a:ba:56:6e:bc:7f: - f3:9c:32:08:de:ef:4d:d7:22:05:5d:5b:73:36:48:35:b4:5d: - 82:f0:85:13:c9:89:ba:a6:7b:24:8e:5f:b7:a7:f4:37:85:f5: - bc:ca:21:7c + Signature Value: + 88:57:78:20:07:d5:4b:ba:97:28:33:8e:cc:fb:98:62:99:46: + 24:f7:c1:4b:d4:51:2c:5a:90:ce:e8:a7:81:0c:3e:d5:e8:19: + a7:2a:d4:0c:64:4a:99:00:0a:3a:1b:09:4c:13:03:76:b5:f3: + db:66:09:56:79:0f:61:5c:ea:1b:f4:52:3d:52:53:ef:dd:cd: + da:58:20:db:3a:cd:6b:6c:f6:bf:3f:16:1a:12:0d:2e:ad:37: + 80:41:2d:7c:6c:21:38:b1:a1:f8:20:60:03:b1:ee:75:0b:bf: + c9:02:f8:46:9a:66:19:3b:8b:5d:3a:3b:a7:39:d0:fd:88:77: + b0:39:cf:75:0b:fb:f0:67:56:41:1e:63:26:5c:fe:5a:cb:6e: + be:aa:36:e0:04:a4:5c:ae:2e:b2:7f:9f:55:d4:81:d8:cd:a9: + 4e:e7:b6:a8:bb:19:70:6b:63:ac:51:1b:3f:b1:16:c2:5c:b3: + 80:4a:2d:da:d9:18:1d:08:58:0a:99:b8:1e:6d:4f:87:f2:6b: + bb:76:92:d4:8a:f1:13:66:bf:39:ab:22:9a:17:84:ee:c1:f9: + 14:88:02:3c:03:11:6b:9e:e0:d5:fc:4f:ec:11:38:3d:7a:7c: + e7:00:d9:ac:f3:fd:bc:30:e5:0c:e5:dc:27:b2:61:3f:20:04: + 47:72:4c:42 -----BEGIN CERTIFICATE----- -MIIEWjCCA0KgAwIBAgIJANjT46bL4816MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV +MIIEWjCCA0KgAwIBAgIJANjT46bL482EMA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV BAYTAkZJMRAwDgYDVQQHDAdUdXVzdWxhMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UE -AwwHUm9vdCBDQTAeFw0yMjA0MTYxMDE5MzhaFw0yMzA0MTYxMDE5MzhaMD4xCzAJ +AwwHUm9vdCBDQTAeFw0yMzA0MTgwODAyNDJaFw0yNDA0MTcwODAyNDJaMD4xCzAJ BgNVBAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEfMB0GA1UEAwwWc2VydmVyLXBvbGlj aWVzMi53MS5maTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAOZQ0SgF J2zUQtNCx8xTqWvCo6sgbxc0neQdMdDEaGVC1ei9qrjk6fbuLnXNaoz2jqqvbHzr @@ -92,11 +90,11 @@ o4HXMIHUMAkGA1UdEwQCMAAwHQYDVR0OBBYEFE4Bi37Cd5ThaLPEKTUkBQvehEqJ MB8GA1UdIwQYMBaAFKT9uTkbgbOq64gd1IGptRFwzKfhMDUGCCsGAQUFBwEBBCkw JzAlBggrBgEFBQcwAYYZaHR0cDovL3NlcnZlci53MS5maTo4ODg4LzAhBgNVHREE GjAYghZzZXJ2ZXItcG9saWNpZXMyLncxLmZpMBgGA1UdIAQRMA8wDQYLKwYBBAGC -vmgBAwIwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBACcJ -wEmu05b5ZHBLBBbO0Ixfk+WbfNlYOCiD+vl1ZyqdjX+2uGH11xehsqqrEXmyZZNA -G88ydlAmctGYyE8k2YpJxkPrg6BLjQVWVVqZO2PBmOqe5hkP1B3iA3jCnlOlZ2p+ -KrQ+GPonpvV0vV7tdEY1B6BGl0U+HpjvwF1dY5af3Gw04XODSs0b2t2B2ewraOYh -/q/JCCtN96qIEUtkv5XEchuJK5/Wu72bqHko7NNNNMDOn58k16xPj4UssXl70oZW -PEhq+8FKdBO3YCf20jRy+Tq6Vm68f/OcMgje703XIgVdW3M2SDW0XYLwhRPJibqm -eySOX7en9DeF9bzKIXw= +vmgBAwIwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAIhX +eCAH1Uu6lygzjsz7mGKZRiT3wUvUUSxakM7op4EMPtXoGacq1AxkSpkACjobCUwT +A3a189tmCVZ5D2Fc6hv0Uj1SU+/dzdpYINs6zWts9r8/FhoSDS6tN4BBLXxsITix +ofggYAOx7nULv8kC+EaaZhk7i106O6c50P2Id7A5z3UL+/BnVkEeYyZc/lrLbr6q +NuAEpFyuLrJ/n1XUgdjNqU7ntqi7GXBrY6xRGz+xFsJcs4BKLdrZGB0IWAqZuB5t +T4fya7t2ktSK8RNmvzmrIpoXhO7B+RSIAjwDEWue4NX8T+wROD16fOcA2azz/bww +5Qzl3CeyYT8gBEdyTEI= -----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 4af47563f..5d8f2fe34 100644 --- a/tests/hwsim/auth_serv/server-eku-client-server.pem +++ b/tests/hwsim/auth_serv/server-eku-client-server.pem @@ -2,16 +2,16 @@ Certificate: Data: Version: 3 (0x2) Serial Number: - d8:d3:e3:a6:cb:e3:cd:77 + d8:d3:e3:a6:cb:e3:cd:81 Signature Algorithm: sha256WithRSAEncryption Issuer: C=FI, L=Tuusula, O=w1.fi, CN=Root CA Validity - Not Before: Apr 16 10:19:38 2022 GMT - Not After : Apr 16 10:19:38 2023 GMT + Not Before: Apr 18 08:02:42 2023 GMT + Not After : Apr 17 08:02:42 2024 GMT Subject: C=FI, O=w1.fi, CN=server6.w1.fi Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:d0:23:f4:80:12:be:4a:64:4d:af:99:af:52:ef: 8d:f5:73:9a:1a:28:2b:92:e8:d4:90:25:3e:85:47: @@ -38,33 +38,32 @@ Certificate: X509v3 Subject Key Identifier: AB:D2:88:CA:9C:44:26:89:2E:C0:B9:8D:46:DD:5C:69:02:9E:01:CB X509v3 Authority Key Identifier: - keyid:A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 - + A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 Authority Information Access: OCSP - URI:http://server.w1.fi:8888/ - X509v3 Extended Key Usage: TLS Web Client Authentication, TLS Web Server Authentication Signature Algorithm: sha256WithRSAEncryption - 2c:27:7c:89:6c:db:0d:4a:42:e7:83:6e:f5:f8:5b:43:79:80: - c2:d1:ac:ba:4e:7d:6a:e9:21:1e:61:71:e0:ce:d4:b6:c0:9d: - 84:50:37:f3:06:05:1f:28:c1:03:59:7e:06:68:24:21:af:ee: - 7b:81:f5:d7:8b:33:1f:3d:1e:b2:7c:c0:94:c1:49:e8:79:e0: - ae:f3:f4:fa:e7:e6:7f:3a:b0:7f:49:41:25:70:73:73:30:17: - 57:aa:37:4e:d3:f2:06:26:62:b3:c4:3b:7a:23:87:f2:28:cb: - 8f:cc:9f:dd:97:f7:0c:d6:26:59:67:8c:16:a5:05:94:dc:a1: - 42:87:f2:49:69:70:e9:db:b4:13:a9:85:81:64:2a:96:41:8a: - d6:2b:34:49:0a:18:2e:26:31:7f:c9:e8:02:18:ce:c4:2f:0e: - b0:bd:d3:41:0b:8c:d2:de:cf:2f:b7:e5:ff:b3:d5:22:05:46: - 0d:7f:19:4f:45:fb:64:7e:68:9c:e8:4b:a4:e3:33:4b:b6:59: - 5e:c2:e9:e3:0f:20:a6:8e:88:47:a4:70:3d:f1:8e:34:51:43: - df:52:55:42:6e:96:40:6b:22:d2:7d:22:93:9c:1a:1a:7a:23: - e4:6f:be:13:99:07:af:08:6a:23:f8:3b:62:4c:2f:19:b5:aa: - e7:5e:b3:62 + Signature Value: + 9b:0c:21:e8:56:b8:41:d4:f7:9b:a4:54:16:2f:f1:86:2a:e1: + 65:a1:e2:2f:f7:10:1e:c7:ee:b8:3b:c3:28:4b:6d:f9:2e:77: + 6b:eb:4b:ea:1c:8b:e3:be:92:b0:67:75:d6:15:62:a1:ec:63: + 55:2d:12:32:a5:4c:e7:bb:27:41:de:9c:20:b6:a0:4d:7a:ea: + 63:6b:49:0a:fe:d7:4d:af:40:ff:35:61:88:00:c0:2b:fa:7b: + 88:b7:c0:fd:40:db:90:ba:de:23:04:82:76:f5:2a:a9:b6:56: + 6e:3e:e4:c7:af:27:6c:59:c5:8d:d8:37:9a:3d:73:80:e7:33: + 4d:72:00:cb:7a:70:55:0d:0b:9a:e1:26:b1:ba:a9:07:a2:ea: + 14:e8:e8:98:23:a9:20:71:dd:08:b6:41:ab:f9:84:dd:2d:51: + 58:d2:15:c2:95:9f:dc:da:ec:f7:79:2b:a2:5b:a1:77:c8:b4: + d2:5d:39:7e:22:3c:34:50:86:d3:dd:0d:2d:a7:d4:b4:be:fb: + 8d:9c:e7:07:52:4b:8a:13:02:0f:5c:43:cd:a0:e6:2a:f1:74: + 6e:a8:cd:3c:10:aa:e6:41:d3:4b:eb:e3:5c:a7:e0:ef:4c:3f: + fc:ee:6a:74:8c:c3:99:bf:3a:94:6f:b9:36:ee:9b:40:6a:e9: + c3:5e:6d:a2 -----BEGIN CERTIFICATE----- -MIIDnjCCAoagAwIBAgIJANjT46bL4813MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV +MIIDnjCCAoagAwIBAgIJANjT46bL482BMA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV BAYTAkZJMRAwDgYDVQQHDAdUdXVzdWxhMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UE -AwwHUm9vdCBDQTAeFw0yMjA0MTYxMDE5MzhaFw0yMzA0MTYxMDE5MzhaMDUxCzAJ +AwwHUm9vdCBDQTAeFw0yMzA0MTgwODAyNDJaFw0yNDA0MTcwODAyNDJaMDUxCzAJ BgNVBAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEWMBQGA1UEAwwNc2VydmVyNi53MS5m aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAj9IASvkpkTa+Zr1Lv jfVzmhooK5Lo1JAlPoVHn8nEuXo1JIQvHlEWZtOsMerxY6RM6ibw+mHHn/J0aWp4 @@ -76,10 +75,10 @@ kXECAwEAAaOBpDCBoTAJBgNVHRMEAjAAMB0GA1UdDgQWBBSr0ojKnEQmiS7AuY1G 3VxpAp4ByzAfBgNVHSMEGDAWgBSk/bk5G4GzquuIHdSBqbURcMyn4TA1BggrBgEF BQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6Ly9zZXJ2ZXIudzEuZmk6ODg4OC8w HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IB -AQAsJ3yJbNsNSkLng271+FtDeYDC0ay6Tn1q6SEeYXHgztS2wJ2EUDfzBgUfKMED -WX4GaCQhr+57gfXXizMfPR6yfMCUwUnoeeCu8/T65+Z/OrB/SUElcHNzMBdXqjdO -0/IGJmKzxDt6I4fyKMuPzJ/dl/cM1iZZZ4wWpQWU3KFCh/JJaXDp27QTqYWBZCqW -QYrWKzRJChguJjF/yegCGM7ELw6wvdNBC4zS3s8vt+X/s9UiBUYNfxlPRftkfmic -6Euk4zNLtllewunjDyCmjohHpHA98Y40UUPfUlVCbpZAayLSfSKTnBoaeiPkb74T -mQevCGoj+DtiTC8ZtarnXrNi +AQCbDCHoVrhB1PebpFQWL/GGKuFloeIv9xAex+64O8MoS235Lndr60vqHIvjvpKw +Z3XWFWKh7GNVLRIypUznuydB3pwgtqBNeupja0kK/tdNr0D/NWGIAMAr+nuIt8D9 +QNuQut4jBIJ29SqptlZuPuTHrydsWcWN2DeaPXOA5zNNcgDLenBVDQua4SaxuqkH +ouoU6OiYI6kgcd0ItkGr+YTdLVFY0hXClZ/c2uz3eSuiW6F3yLTSXTl+Ijw0UIbT +3Q0tp9S0vvuNnOcHUkuKEwIPXEPNoOYq8XRuqM08EKrmQdNL6+Ncp+DvTD/87mp0 +jMOZvzqUb7k27ptAaunDXm2i -----END CERTIFICATE----- diff --git a/tests/hwsim/auth_serv/server-eku-client.pem b/tests/hwsim/auth_serv/server-eku-client.pem index 19115f819..c465b114b 100644 --- a/tests/hwsim/auth_serv/server-eku-client.pem +++ b/tests/hwsim/auth_serv/server-eku-client.pem @@ -2,16 +2,16 @@ Certificate: Data: Version: 3 (0x2) Serial Number: - d8:d3:e3:a6:cb:e3:cd:76 + d8:d3:e3:a6:cb:e3:cd:80 Signature Algorithm: sha256WithRSAEncryption Issuer: C=FI, L=Tuusula, O=w1.fi, CN=Root CA Validity - Not Before: Apr 16 10:19:38 2022 GMT - Not After : Apr 16 10:19:38 2023 GMT + Not Before: Apr 18 08:02:42 2023 GMT + Not After : Apr 17 08:02:42 2024 GMT Subject: C=FI, O=w1.fi, CN=server5.w1.fi Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:a5:94:60:80:b8:c8:61:18:8c:02:9d:dc:cc:c4: 74:d1:17:b5:3b:47:9c:38:0f:3b:92:74:fb:ea:27: @@ -38,33 +38,32 @@ Certificate: X509v3 Subject Key Identifier: 32:9F:9F:30:24:73:73:CB:8D:53:3A:80:23:EB:5B:5D:4C:DD:06:01 X509v3 Authority Key Identifier: - keyid:A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 - + A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 Authority Information Access: OCSP - URI:http://server.w1.fi:8888/ - X509v3 Extended Key Usage: TLS Web Client Authentication Signature Algorithm: sha256WithRSAEncryption - bc:9a:3e:81:54:1a:2a:d9:69:6f:a6:31:ff:2d:07:ab:1d:10: - 1a:f3:92:89:75:a5:26:39:e4:ad:54:2a:36:46:cf:5a:fc:83: - 1c:b6:cf:60:23:ed:6a:c6:85:43:16:80:b8:d0:0b:27:98:d9: - 9e:2f:96:e9:80:24:74:9f:3d:04:0f:29:c3:9b:14:4d:31:5f: - 61:8c:a0:57:ee:89:3d:6d:fd:96:f0:59:3a:b2:88:22:da:85: - 00:dd:07:57:d9:c9:1f:73:ae:73:7d:d6:0e:c9:ff:14:5d:26: - cd:e1:da:ab:03:af:8e:77:61:b8:98:f0:2e:6e:46:e6:e1:16: - 60:16:bb:ec:c5:73:43:4a:df:10:20:d6:8d:54:59:b7:29:0f: - 89:24:5e:9f:cc:e4:0d:58:c3:bb:43:4c:73:2f:d9:9c:e1:24: - 60:2a:69:28:46:d3:3d:57:f9:c1:28:70:76:a8:4b:bf:ad:95: - ca:b7:24:3d:95:ed:5f:6e:be:04:12:89:6c:20:cd:a5:f6:55: - 53:1f:db:45:cd:9e:9e:de:51:ca:5f:d9:ac:a1:02:1c:b7:8e: - fc:20:0e:6e:03:f1:3f:e8:c5:69:cc:e9:16:67:fc:4c:0f:c3: - b9:03:eb:28:70:a8:2f:c7:70:8f:e4:a2:39:36:81:01:09:ad: - 43:78:03:f9 + Signature Value: + ba:e6:af:f3:c2:8d:42:2c:3e:80:3d:98:b1:d8:c0:4d:c1:18: + ca:d7:74:25:42:dd:9a:13:9c:74:e0:7a:a0:d7:b1:0c:a3:5c: + 2d:db:a7:43:dd:bd:ce:f1:ed:e8:80:5a:38:11:61:23:2f:aa: + a3:47:46:66:59:cd:d3:aa:1e:60:5f:59:a0:de:a9:27:c8:11: + 0c:56:80:d6:c4:df:b7:d8:9c:f6:bb:14:08:8d:47:42:91:9c: + d2:40:62:42:5f:06:3a:94:d4:13:af:88:9b:0c:53:69:bc:45: + 4a:32:bb:54:53:6b:95:88:8f:2d:f5:92:f2:8f:03:f8:32:b2: + 6c:94:32:7b:fa:5e:46:d8:f5:39:65:ff:cd:dc:2d:0e:d8:78: + ef:96:13:9c:d1:6e:57:c9:27:64:ed:16:d7:1e:7b:fd:47:19: + 73:0e:f0:d0:27:5b:4b:82:4a:2c:ae:f5:1a:c4:15:b5:84:a9: + 66:4e:63:13:d9:0a:d4:88:28:ec:95:2a:7f:0f:a4:c5:3e:84: + b4:98:16:21:a2:1a:71:a1:af:4b:8b:be:d0:6c:99:3e:61:94: + 19:7a:fc:2a:2c:7e:3d:df:be:b8:fb:52:0c:d9:fa:94:8a:18: + 88:a9:b1:73:33:2d:e5:78:53:75:88:99:1b:fc:ae:b9:25:59: + cd:e1:03:77 -----BEGIN CERTIFICATE----- -MIIDlDCCAnygAwIBAgIJANjT46bL4812MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV +MIIDlDCCAnygAwIBAgIJANjT46bL482AMA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV BAYTAkZJMRAwDgYDVQQHDAdUdXVzdWxhMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UE -AwwHUm9vdCBDQTAeFw0yMjA0MTYxMDE5MzhaFw0yMzA0MTYxMDE5MzhaMDUxCzAJ +AwwHUm9vdCBDQTAeFw0yMzA0MTgwODAyNDJaFw0yNDA0MTcwODAyNDJaMDUxCzAJ BgNVBAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEWMBQGA1UEAwwNc2VydmVyNS53MS5m aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKWUYIC4yGEYjAKd3MzE dNEXtTtHnDgPO5J0++onRUSKmipNECWOd84aCclzGf7ccDZejPqPTIS793LklE/8 @@ -75,11 +74,11 @@ u9jjFCVw3tHHnVnPJEbH9W5vg2btGx0+UQSUZ2TfUSI8wOEkCjdq3GqL/UVbli0D rGMCAwEAAaOBmjCBlzAJBgNVHRMEAjAAMB0GA1UdDgQWBBQyn58wJHNzy41TOoAj 61tdTN0GATAfBgNVHSMEGDAWgBSk/bk5G4GzquuIHdSBqbURcMyn4TA1BggrBgEF BQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6Ly9zZXJ2ZXIudzEuZmk6ODg4OC8w -EwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBALyaPoFUGirZ -aW+mMf8tB6sdEBrzkol1pSY55K1UKjZGz1r8gxy2z2Aj7WrGhUMWgLjQCyeY2Z4v -lumAJHSfPQQPKcObFE0xX2GMoFfuiT1t/ZbwWTqyiCLahQDdB1fZyR9zrnN91g7J -/xRdJs3h2qsDr453YbiY8C5uRubhFmAWu+zFc0NK3xAg1o1UWbcpD4kkXp/M5A1Y -w7tDTHMv2ZzhJGAqaShG0z1X+cEocHaoS7+tlcq3JD2V7V9uvgQSiWwgzaX2VVMf -20XNnp7eUcpf2ayhAhy3jvwgDm4D8T/oxWnM6RZn/EwPw7kD6yhwqC/HcI/kojk2 -gQEJrUN4A/k= +EwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBALrmr/PCjUIs +PoA9mLHYwE3BGMrXdCVC3ZoTnHTgeqDXsQyjXC3bp0Pdvc7x7eiAWjgRYSMvqqNH +RmZZzdOqHmBfWaDeqSfIEQxWgNbE37fYnPa7FAiNR0KRnNJAYkJfBjqU1BOviJsM +U2m8RUoyu1RTa5WIjy31kvKPA/gysmyUMnv6XkbY9Tll/83cLQ7YeO+WE5zRblfJ +J2TtFtcee/1HGXMO8NAnW0uCSiyu9RrEFbWEqWZOYxPZCtSIKOyVKn8PpMU+hLSY +FiGiGnGhr0uLvtBsmT5hlBl6/Cosfj3fvrj7UgzZ+pSKGIipsXMzLeV4U3WImRv8 +rrklWc3hA3c= -----END CERTIFICATE----- diff --git a/tests/hwsim/auth_serv/server-expired.pem b/tests/hwsim/auth_serv/server-expired.pem index aeb9cb6f4..efa936511 100644 --- a/tests/hwsim/auth_serv/server-expired.pem +++ b/tests/hwsim/auth_serv/server-expired.pem @@ -2,7 +2,7 @@ Certificate: Data: Version: 3 (0x2) Serial Number: - d8:d3:e3:a6:cb:e3:cd:75 + d8:d3:e3:a6:cb:e3:cd:7f Signature Algorithm: sha256WithRSAEncryption Issuer: C=FI, L=Tuusula, O=w1.fi, CN=Root CA Validity @@ -11,7 +11,7 @@ Certificate: Subject: C=FI, O=w1.fi, CN=server4.w1.fi Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:b0:77:f1:3e:66:e7:fc:0b:51:f9:d8:a3:ae:2f: f6:4a:75:38:3e:d4:47:7b:d6:24:32:b4:c8:d9:e0: @@ -38,31 +38,30 @@ Certificate: X509v3 Subject Key Identifier: 21:B0:31:C6:14:D4:BD:5C:DF:70:24:51:34:9E:93:F5:18:B3:1C:A1 X509v3 Authority Key Identifier: - keyid:A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 - + A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 Authority Information Access: OCSP - URI:http://server.w1.fi:8888/ - X509v3 Extended Key Usage: TLS Web Server Authentication Signature Algorithm: sha256WithRSAEncryption - 89:3b:61:33:f0:6a:15:a7:b4:67:f4:43:f7:17:33:d3:de:6b: - 38:6e:b6:37:ec:47:55:ff:e0:92:15:32:01:76:d9:12:a2:5a: - 90:dd:03:1c:6b:a0:2b:ca:b1:bf:47:a0:26:54:a4:8c:6c:d3: - d6:a6:59:25:e7:20:80:40:67:40:d1:e2:65:ba:21:77:f2:7e: - c5:15:d2:b5:8c:ca:7f:c5:80:56:02:a5:26:eb:88:5c:0a:ad: - 5d:26:0d:30:a2:c0:83:1a:e7:12:0f:2b:21:1b:d9:37:47:ae: - f6:a4:74:ac:e5:ee:92:d4:48:bc:3a:be:22:e3:34:c5:19:b6: - e6:cc:8f:29:bd:0b:dd:06:3e:fa:dd:e1:5f:d5:d5:c3:fe:2b: - d5:cf:86:e9:e3:92:8c:a0:53:82:e1:22:db:4d:6f:37:f4:61: - 5b:b7:20:19:9c:c3:cd:ef:b4:b2:5e:fa:05:7d:3e:b7:0c:88: - 51:f2:e1:85:23:0b:73:85:dd:2c:44:cb:f8:49:3c:4a:9b:a9: - 14:89:34:06:bd:13:e5:a3:01:27:ae:2f:1d:0e:57:10:db:13: - 32:ee:bd:a2:4c:26:7b:dd:51:37:13:8f:6c:1f:ea:64:92:0f: - 35:58:91:d9:dc:2c:7f:b6:bd:8d:6c:34:4e:8d:27:de:2c:ff: - 6b:a2:ed:cc + Signature Value: + 41:59:17:46:54:33:fd:33:0c:e4:9c:4b:55:d7:b3:be:5a:0e: + 10:3c:e6:f4:d0:74:e0:8a:e9:13:8b:06:f4:94:8b:20:bf:52: + 69:b4:8f:1c:f7:94:e9:5f:c0:bd:63:11:37:0d:96:56:fc:15: + 24:1e:59:f1:bc:e5:75:ec:72:8d:f8:ad:34:c4:3d:4a:2f:18: + 8c:4b:f1:9d:9f:64:55:4c:ff:1a:90:47:e1:09:04:89:bd:8e: + cd:cc:39:56:ee:ba:8d:76:ed:c7:c8:34:00:d7:11:c8:f3:5e: + 85:ae:6d:b0:14:b3:3a:04:5d:ec:58:35:8c:2d:6a:25:38:c6: + e4:f8:0c:53:9f:74:8f:9c:b4:11:d3:44:6a:4c:13:e1:2e:c4: + 05:83:cc:a4:b0:32:03:e2:b5:58:b2:c7:e7:f2:28:18:59:19: + 8e:7e:81:75:46:21:38:df:14:f7:a5:4d:70:ad:8b:7a:d8:46: + 16:3a:71:13:7f:98:41:91:02:88:dc:75:95:8a:b1:57:3a:5a: + a2:74:ce:f1:14:6d:14:9c:0e:ae:c9:99:8f:cf:29:28:a6:6b: + b5:c9:80:4d:0b:bb:19:6f:23:69:64:3c:b7:89:a0:63:30:ed: + 0b:56:41:d0:56:3f:ed:0f:eb:07:51:29:7d:21:a4:ff:0f:28: + 80:3b:bb:c1 -----BEGIN CERTIFICATE----- -MIIDlDCCAnygAwIBAgIJANjT46bL4811MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV +MIIDlDCCAnygAwIBAgIJANjT46bL481/MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV BAYTAkZJMRAwDgYDVQQHDAdUdXVzdWxhMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UE AwwHUm9vdCBDQTAeFw0yMDAxMDEwMDAwMDBaFw0yMDAxMDIwMDAwMDBaMDUxCzAJ BgNVBAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEWMBQGA1UEAwwNc2VydmVyNC53MS5m @@ -75,11 +74,11 @@ c+GT2FEtu0WDj7aTQTlBhF9LrQAlkT0WCuvwuJLgXHVlhRfSgOZeZqKk38cIdjNJ zx0CAwEAAaOBmjCBlzAJBgNVHRMEAjAAMB0GA1UdDgQWBBQhsDHGFNS9XN9wJFE0 npP1GLMcoTAfBgNVHSMEGDAWgBSk/bk5G4GzquuIHdSBqbURcMyn4TA1BggrBgEF BQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6Ly9zZXJ2ZXIudzEuZmk6ODg4OC8w -EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAIk7YTPwahWn -tGf0Q/cXM9PeazhutjfsR1X/4JIVMgF22RKiWpDdAxxroCvKsb9HoCZUpIxs09am -WSXnIIBAZ0DR4mW6IXfyfsUV0rWMyn/FgFYCpSbriFwKrV0mDTCiwIMa5xIPKyEb -2TdHrvakdKzl7pLUSLw6viLjNMUZtubMjym9C90GPvrd4V/V1cP+K9XPhunjkoyg -U4LhIttNbzf0YVu3IBmcw83vtLJe+gV9PrcMiFHy4YUjC3OF3SxEy/hJPEqbqRSJ -NAa9E+WjASeuLx0OVxDbEzLuvaJMJnvdUTcTj2wf6mSSDzVYkdncLH+2vY1sNE6N -J94s/2ui7cw= +EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAEFZF0ZUM/0z +DOScS1XXs75aDhA85vTQdOCK6ROLBvSUiyC/Umm0jxz3lOlfwL1jETcNllb8FSQe +WfG85XXsco34rTTEPUovGIxL8Z2fZFVM/xqQR+EJBIm9js3MOVbuuo127cfINADX +EcjzXoWubbAUszoEXexYNYwtaiU4xuT4DFOfdI+ctBHTRGpME+EuxAWDzKSwMgPi +tViyx+fyKBhZGY5+gXVGITjfFPelTXCti3rYRhY6cRN/mEGRAojcdZWKsVc6WqJ0 +zvEUbRScDq7JmY/PKSima7XJgE0LuxlvI2lkPLeJoGMw7QtWQdBWP+0P6wdRKX0h +pP8PKIA7u8E= -----END CERTIFICATE----- diff --git a/tests/hwsim/auth_serv/server-extra.pkcs12 b/tests/hwsim/auth_serv/server-extra.pkcs12 index d591ba080..7f74d2e7c 100644 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-long-duration.pem b/tests/hwsim/auth_serv/server-long-duration.pem index a036a7ee3..c5ec36fc4 100644 --- a/tests/hwsim/auth_serv/server-long-duration.pem +++ b/tests/hwsim/auth_serv/server-long-duration.pem @@ -2,16 +2,16 @@ Certificate: Data: Version: 3 (0x2) Serial Number: - d8:d3:e3:a6:cb:e3:cd:78 + d8:d3:e3:a6:cb:e3:cd:82 Signature Algorithm: sha256WithRSAEncryption Issuer: C=FI, L=Tuusula, O=w1.fi, CN=Root CA Validity - Not Before: Apr 16 10:19:38 2022 GMT - Not After : Apr 3 10:19:38 2072 GMT + Not Before: Apr 18 08:02:42 2023 GMT + Not After : Apr 5 08:02:42 2073 GMT Subject: C=FI, O=w1.fi, CN=server7.w1.fi Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:bf:10:c2:eb:bf:bd:0f:21:68:44:26:78:d6:90: 0f:de:9c:67:78:07:6f:2e:34:e1:51:a6:34:6e:1d: @@ -55,33 +55,32 @@ Certificate: X509v3 Subject Key Identifier: 30:C9:45:D8:D3:C8:8E:E6:41:B8:29:BD:48:DE:BF:CD:9A:A5:81:CE X509v3 Authority Key Identifier: - keyid:A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 - + A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 Authority Information Access: OCSP - URI:http://server.w1.fi:8888/ - X509v3 Extended Key Usage: TLS Web Server Authentication Signature Algorithm: sha256WithRSAEncryption - 93:d8:7c:60:5f:be:d0:c2:e4:e1:ca:50:fd:e1:8b:18:85:f2: - b9:ef:cd:4e:ef:6c:a9:35:3a:9e:b5:6f:f5:f8:e5:05:ab:3d: - 19:0d:12:2e:96:c9:75:fd:f1:aa:e7:0a:a7:a8:2e:e5:c8:71: - ab:7a:c9:f0:bd:e8:68:9f:ab:62:00:95:5c:1d:56:98:b4:fc: - fd:3e:54:3c:3d:50:1c:e4:37:7a:9a:51:c4:d9:33:32:91:8e: - 43:cc:40:0b:50:15:99:60:24:32:60:4f:29:31:24:a5:4b:54: - 2d:39:1b:ce:79:2e:e8:4f:a3:4c:93:66:5c:e8:17:39:ce:65: - 5a:e2:0b:f3:a8:c8:9b:87:5e:b5:9a:a0:0b:8b:1b:85:ec:92: - 87:88:e2:21:38:d9:40:e0:47:78:81:85:cc:a2:56:d1:61:86: - 82:4f:04:93:ed:70:f4:0d:d2:1c:4c:a9:1e:47:f0:12:e4:64: - 9d:f2:16:03:8d:b1:56:9b:cb:94:fc:50:0a:30:b8:39:47:59: - 7f:4d:dd:11:a8:3c:d1:54:9d:08:a0:c7:fd:17:46:62:b9:76: - ba:6d:95:eb:fb:ea:79:cc:ba:a8:0d:34:dd:3f:66:fa:e4:79: - 7b:c7:b9:fb:85:b5:1b:ca:ca:af:b4:30:94:65:46:ee:ba:5d: - 04:75:35:e9 + Signature Value: + 5c:80:8b:a6:6f:32:7e:a0:80:99:79:4d:2c:10:69:07:e5:e6: + bd:24:97:43:b8:bd:0a:16:bb:1d:7c:69:0d:50:bc:2d:1e:d5: + 7d:bf:14:b5:9a:7a:96:e0:51:88:39:12:51:b1:a7:3a:11:86: + e2:cc:65:24:0d:6d:1e:da:27:f6:8d:11:3d:c7:9c:dd:1d:1d: + 5c:6a:46:73:87:58:53:bd:52:fd:7d:ba:ba:f2:dc:aa:0d:fe: + 78:1c:38:d1:4d:ac:d8:2f:8a:37:f5:e0:8c:22:70:77:01:d9: + 26:34:49:6e:e8:07:a3:2c:f1:b9:ee:cd:e2:31:64:c0:e8:c0: + ab:4a:be:ab:84:f1:db:51:4f:be:b0:27:2b:62:1d:29:4a:ff: + 6c:d7:8b:33:29:56:b7:82:33:99:2c:cd:f8:da:4d:a9:0c:b5: + 7d:c8:71:3a:d0:f7:c2:d9:0b:17:d7:73:9f:3a:73:bc:df:14: + 0f:09:6e:42:66:dd:ea:67:6d:52:87:d5:e4:82:55:1a:45:c3: + 5a:15:66:ae:a0:db:bf:8d:05:d0:34:b2:bd:6d:1f:a4:60:c7: + 5a:56:94:33:0f:35:a1:9a:3a:b9:f0:66:f5:bb:cc:cc:69:15: + 5d:ba:37:61:7d:25:0c:09:5f:ac:7b:30:38:2a:5d:c7:71:de: + 38:b8:86:5d -----BEGIN CERTIFICATE----- -MIIEljCCA36gAwIBAgIJANjT46bL4814MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV +MIIEljCCA36gAwIBAgIJANjT46bL482CMA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV BAYTAkZJMRAwDgYDVQQHDAdUdXVzdWxhMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UE -AwwHUm9vdCBDQTAgFw0yMjA0MTYxMDE5MzhaGA8yMDcyMDQwMzEwMTkzOFowNTEL +AwwHUm9vdCBDQTAgFw0yMzA0MTgwODAyNDJaGA8yMDczMDQwNTA4MDI0MlowNTEL MAkGA1UEBhMCRkkxDjAMBgNVBAoMBXcxLmZpMRYwFAYDVQQDDA1zZXJ2ZXI3Lncx LmZpMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvxDC67+9DyFoRCZ4 1pAP3pxneAdvLjThUaY0bh1P8R8at5N6GgE2BNTjNfCbUo3MLYCTaDcACV/hDYo1 @@ -98,10 +97,10 @@ fbuUpDl734zsZMjFjYZUb/GHk1ECAwEAAaOBmjCBlzAJBgNVHRMEAjAAMB0GA1Ud DgQWBBQwyUXY08iO5kG4Kb1I3r/NmqWBzjAfBgNVHSMEGDAWgBSk/bk5G4GzquuI HdSBqbURcMyn4TA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6Ly9z ZXJ2ZXIudzEuZmk6ODg4OC8wEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcN -AQELBQADggEBAJPYfGBfvtDC5OHKUP3hixiF8rnvzU7vbKk1Op61b/X45QWrPRkN -Ei6WyXX98arnCqeoLuXIcat6yfC96Gifq2IAlVwdVpi0/P0+VDw9UBzkN3qaUcTZ -MzKRjkPMQAtQFZlgJDJgTykxJKVLVC05G855LuhPo0yTZlzoFznOZVriC/OoyJuH -XrWaoAuLG4XskoeI4iE42UDgR3iBhcyiVtFhhoJPBJPtcPQN0hxMqR5H8BLkZJ3y -FgONsVaby5T8UAowuDlHWX9N3RGoPNFUnQigx/0XRmK5drptlev76nnMuqgNNN0/ -ZvrkeXvHufuFtRvKyq+0MJRlRu66XQR1Nek= +AQELBQADggEBAFyAi6ZvMn6ggJl5TSwQaQfl5r0kl0O4vQoWux18aQ1QvC0e1X2/ +FLWaepbgUYg5ElGxpzoRhuLMZSQNbR7aJ/aNET3HnN0dHVxqRnOHWFO9Uv19urry +3KoN/ngcONFNrNgvijf14IwicHcB2SY0SW7oB6Ms8bnuzeIxZMDowKtKvquE8dtR +T76wJytiHSlK/2zXizMpVreCM5kszfjaTakMtX3IcTrQ98LZCxfXc586c7zfFA8J +bkJm3epnbVKH1eSCVRpFw1oVZq6g27+NBdA0sr1tH6Rgx1pWlDMPNaGaOrnwZvW7 +zMxpFV26N2F9JQwJX6x7MDgqXcdx3ji4hl0= -----END CERTIFICATE----- diff --git a/tests/hwsim/auth_serv/server-no-dnsname.pem b/tests/hwsim/auth_serv/server-no-dnsname.pem index a4cf5f8bd..3ba6edefc 100644 --- a/tests/hwsim/auth_serv/server-no-dnsname.pem +++ b/tests/hwsim/auth_serv/server-no-dnsname.pem @@ -2,16 +2,16 @@ Certificate: Data: Version: 3 (0x2) Serial Number: - d8:d3:e3:a6:cb:e3:cd:74 + d8:d3:e3:a6:cb:e3:cd:7e Signature Algorithm: sha256WithRSAEncryption Issuer: C=FI, L=Tuusula, O=w1.fi, CN=Root CA Validity - Not Before: Apr 16 10:19:38 2022 GMT - Not After : Apr 16 10:19:38 2023 GMT + Not Before: Apr 18 08:02:42 2023 GMT + Not After : Apr 17 08:02:42 2024 GMT Subject: C=FI, O=w1.fi, CN=server3.w1.fi Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:c2:eb:ad:04:6f:4c:eb:23:b8:92:4e:75:dc:00: d0:0d:d9:ad:09:21:f8:12:4a:2d:cd:db:7d:63:a1: @@ -38,33 +38,32 @@ Certificate: X509v3 Subject Key Identifier: 5E:84:D6:31:98:17:71:F8:63:5C:32:5B:7D:33:C0:D4:FA:36:A7:6A X509v3 Authority Key Identifier: - keyid:A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 - + A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 Authority Information Access: OCSP - URI:http://server.w1.fi:8888/ - X509v3 Extended Key Usage: TLS Web Server Authentication Signature Algorithm: sha256WithRSAEncryption - 4b:65:c3:76:95:3f:54:74:56:3d:a9:0a:5c:d5:2a:20:e0:f6: - 01:0e:19:b6:0a:53:5d:01:05:5a:a4:f6:7d:fe:dc:1b:0b:2c: - da:68:ee:7a:57:bf:16:d9:ab:d3:de:66:3d:4e:a5:08:d9:b8: - 36:4e:ec:f9:f3:f3:40:c5:16:b3:b8:9b:d4:4e:ff:cd:8f:3e: - b2:22:cb:22:18:59:51:7a:0a:86:0e:28:89:bb:82:95:b8:8c: - 93:8e:c0:9b:28:2c:30:01:7c:5a:d8:39:e4:b7:dd:3c:dc:f3: - 87:6e:58:22:fd:d3:29:ce:b8:96:bb:80:dd:20:8b:35:b3:3f: - d0:ef:e5:62:41:2e:b9:b5:85:4a:37:5e:21:bb:48:56:7f:b9: - 8b:a1:35:96:40:5c:89:46:9b:04:0b:1c:75:9c:b5:50:66:c5: - 70:69:1f:3d:3a:c9:3c:1d:53:68:68:db:29:c4:24:57:54:6f: - fc:2b:9f:60:88:29:25:b2:5e:75:c0:d9:d1:8c:34:80:a2:61: - b4:cc:ae:7c:00:c5:35:ce:28:8c:b8:b8:01:80:85:99:97:f2: - 36:4c:74:a7:bc:eb:51:78:b9:cf:7b:28:b0:fb:67:4c:14:20: - 99:3c:99:fb:31:28:ad:07:cc:7a:1c:34:2b:cf:34:ea:65:a7: - 77:1d:2b:b4 + Signature Value: + 76:b4:10:91:bf:f2:00:22:ed:ef:94:50:85:1c:60:3d:da:b9: + 89:57:f8:6c:5d:cd:c2:2d:81:ff:2d:83:3c:4d:42:4b:b3:04: + dd:da:3d:7b:de:ef:72:0f:8e:f2:ae:2d:b5:9b:c9:45:58:86: + 42:36:58:cf:0e:03:2c:08:77:60:3d:86:28:7f:62:18:b5:a8: + 6a:0c:c0:cb:11:5d:6b:75:32:a2:f3:ed:7d:d4:d3:91:4c:2b: + bc:2e:7a:46:0d:f4:83:87:d3:e7:25:60:5d:fe:ab:2b:ad:16: + f8:72:3f:bc:12:17:6b:91:c5:e9:25:f9:08:b8:82:31:a7:17: + 7c:8f:d5:68:0e:58:03:78:50:cc:4a:2d:99:40:bc:da:6f:0a: + 7a:e5:71:71:ef:e4:e8:b1:22:12:76:14:1c:f8:13:a1:3c:b8: + 46:ba:e6:31:d4:44:f6:ed:eb:d1:1c:02:15:2f:fc:c0:52:0b: + b9:4a:78:33:42:9d:20:3a:ac:5b:40:a1:41:4b:02:d9:7c:b8: + 80:33:6e:88:b2:6c:49:f6:55:61:da:62:34:58:ab:3c:5c:53: + a0:8e:f2:23:ac:52:40:e5:00:a4:84:79:18:af:c1:7e:e5:c0: + 75:29:f8:79:b2:6b:dc:58:04:12:f8:9e:3d:24:1d:f2:21:f9: + 83:0e:85:42 -----BEGIN CERTIFICATE----- -MIIDlDCCAnygAwIBAgIJANjT46bL4810MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV +MIIDlDCCAnygAwIBAgIJANjT46bL481+MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV BAYTAkZJMRAwDgYDVQQHDAdUdXVzdWxhMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UE -AwwHUm9vdCBDQTAeFw0yMjA0MTYxMDE5MzhaFw0yMzA0MTYxMDE5MzhaMDUxCzAJ +AwwHUm9vdCBDQTAeFw0yMzA0MTgwODAyNDJaFw0yNDA0MTcwODAyNDJaMDUxCzAJ BgNVBAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEWMBQGA1UEAwwNc2VydmVyMy53MS5m aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLrrQRvTOsjuJJOddwA 0A3ZrQkh+BJKLc3bfWOhMhKOuOO935U5OhdlVPgg1nE3fbe0cjF6ej26dHLzrJ0W @@ -75,11 +74,11 @@ hq6aTH1T9rEOgs0GYXfdRlz9RWry6CLKY4vTHPZPEOzqGggeOD2AbKNIR/IWKgdb 94kCAwEAAaOBmjCBlzAJBgNVHRMEAjAAMB0GA1UdDgQWBBRehNYxmBdx+GNcMlt9 M8DU+janajAfBgNVHSMEGDAWgBSk/bk5G4GzquuIHdSBqbURcMyn4TA1BggrBgEF BQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6Ly9zZXJ2ZXIudzEuZmk6ODg4OC8w -EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAEtlw3aVP1R0 -Vj2pClzVKiDg9gEOGbYKU10BBVqk9n3+3BsLLNpo7npXvxbZq9PeZj1OpQjZuDZO -7Pnz80DFFrO4m9RO/82PPrIiyyIYWVF6CoYOKIm7gpW4jJOOwJsoLDABfFrYOeS3 -3Tzc84duWCL90ynOuJa7gN0gizWzP9Dv5WJBLrm1hUo3XiG7SFZ/uYuhNZZAXIlG -mwQLHHWctVBmxXBpHz06yTwdU2ho2ynEJFdUb/wrn2CIKSWyXnXA2dGMNICiYbTM -rnwAxTXOKIy4uAGAhZmX8jZMdKe861F4uc97KLD7Z0wUIJk8mfsxKK0HzHocNCvP -NOplp3cdK7Q= +EwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggEBAHa0EJG/8gAi +7e+UUIUcYD3auYlX+GxdzcItgf8tgzxNQkuzBN3aPXve73IPjvKuLbWbyUVYhkI2 +WM8OAywId2A9hih/Yhi1qGoMwMsRXWt1MqLz7X3U05FMK7wuekYN9IOH0+clYF3+ +qyutFvhyP7wSF2uRxekl+Qi4gjGnF3yP1WgOWAN4UMxKLZlAvNpvCnrlcXHv5Oix +IhJ2FBz4E6E8uEa65jHURPbt69EcAhUv/MBSC7lKeDNCnSA6rFtAoUFLAtl8uIAz +boiybEn2VWHaYjRYqzxcU6CO8iOsUkDlAKSEeRivwX7lwHUp+Hmya9xYBBL4nj0k +HfIh+YMOhUI= -----END CERTIFICATE----- diff --git a/tests/hwsim/auth_serv/server.pem b/tests/hwsim/auth_serv/server.pem index a94a84c07..9ae212c94 100644 --- a/tests/hwsim/auth_serv/server.pem +++ b/tests/hwsim/auth_serv/server.pem @@ -2,16 +2,16 @@ Certificate: Data: Version: 3 (0x2) Serial Number: - d8:d3:e3:a6:cb:e3:cd:73 + d8:d3:e3:a6:cb:e3:cd:7d Signature Algorithm: sha256WithRSAEncryption Issuer: C=FI, L=Tuusula, O=w1.fi, CN=Root CA Validity - Not Before: Apr 16 10:19:38 2022 GMT - Not After : Apr 16 10:19:38 2023 GMT + Not Before: Apr 18 08:02:42 2023 GMT + Not After : Apr 17 08:02:42 2024 GMT Subject: C=FI, O=w1.fi, CN=server.w1.fi Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:fd:0e:5e:cd:19:2c:6a:41:83:d9:2c:0e:36:cd: 09:b0:8f:b2:c9:8c:c8:d2:03:38:6e:54:bc:43:ee: @@ -38,35 +38,34 @@ Certificate: X509v3 Subject Key Identifier: 71:26:7A:1F:72:81:97:24:11:AA:C0:75:FA:BF:31:10:69:49:D0:E7 X509v3 Authority Key Identifier: - keyid:A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 - + A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 Authority Information Access: OCSP - URI:http://server.w1.fi:8888/ - X509v3 Subject Alternative Name: DNS:server.w1.fi X509v3 Extended Key Usage: TLS Web Server Authentication Signature Algorithm: sha256WithRSAEncryption - a3:9c:dd:1d:ab:7d:74:c8:bc:3f:4c:2e:f7:a7:04:bf:81:11: - b2:22:d9:8f:8b:4f:8b:0e:01:bd:b4:0b:91:4b:c8:3a:b0:b1: - 1e:01:4d:eb:56:80:29:2c:5b:79:a7:06:94:60:95:03:1d:5f: - 47:d1:93:c5:9f:51:96:47:93:70:93:98:38:8c:59:6a:f0:3d: - 02:8d:2a:a3:31:98:93:a5:62:50:cc:15:3c:82:1a:ba:4e:50: - 13:68:59:f8:21:c5:80:9d:b4:da:84:d4:01:0d:90:12:29:82: - 11:ef:1d:ea:35:64:7a:65:02:8b:91:ae:f8:66:56:95:5a:bf: - c4:56:f9:12:38:20:6b:34:d4:c7:4f:08:9a:3c:dd:e7:97:0a: - 0a:22:b3:dd:df:90:2a:a3:73:4f:39:aa:5a:ef:9a:57:28:c2: - fb:ea:ba:0b:dc:91:33:ce:45:af:3c:9f:10:ab:ef:32:35:4a: - b0:12:07:91:49:e8:6f:78:fd:b9:54:07:b3:d3:cd:3b:83:2f: - 10:fe:cb:71:58:92:b9:98:b9:a0:02:5a:1b:9c:1b:6d:00:dc: - ca:08:12:20:e7:32:33:6d:2e:66:3a:8b:1a:49:ef:b7:75:78: - d2:c1:3c:6b:63:2f:95:7c:04:25:63:bf:02:85:73:ec:d7:da: - f3:35:36:ab + Signature Value: + 3d:1d:f2:7d:c1:b0:48:79:ae:1c:5c:90:f8:29:99:60:49:ff: + 81:0c:b6:a0:89:21:ea:3f:91:97:a6:27:43:ef:9a:83:bc:46: + db:5d:5b:7f:c5:c3:3d:bb:3c:28:53:7e:5e:a3:1f:ca:06:da: + 74:b3:4b:fc:1f:1f:62:ac:83:a3:b7:41:c1:50:1b:d6:93:b0: + 1f:24:87:be:08:02:f2:51:99:4e:0c:85:cc:df:b8:8d:93:12: + cf:63:ae:9f:47:88:36:55:eb:af:ed:de:07:0b:f8:b1:e8:0f: + cd:fe:fd:4e:69:33:d7:35:3f:18:95:56:20:df:87:58:8e:64: + 60:72:36:21:67:3d:6d:99:85:86:10:33:78:94:b1:75:75:40: + 98:b3:64:38:03:57:e5:11:c7:15:36:4d:44:96:e4:22:ea:1c: + 87:77:76:2a:20:c5:9a:58:f3:85:f9:20:b8:6e:fd:88:2e:73: + 08:7c:22:fb:e5:de:f9:aa:7d:39:1c:ab:d9:b4:37:0b:76:90: + 0a:ee:24:5e:4b:8c:3f:14:38:f9:1f:1c:1f:d1:15:46:d8:ce: + 6c:13:1e:15:62:38:72:72:eb:d9:3f:ab:15:e8:f6:28:8c:e7: + ea:89:75:83:ae:ba:b2:93:4b:9a:61:a1:23:88:a0:9c:e4:39: + 95:5f:2b:84 -----BEGIN CERTIFICATE----- -MIIDrDCCApSgAwIBAgIJANjT46bL481zMA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV +MIIDrDCCApSgAwIBAgIJANjT46bL4819MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV BAYTAkZJMRAwDgYDVQQHDAdUdXVzdWxhMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UE -AwwHUm9vdCBDQTAeFw0yMjA0MTYxMDE5MzhaFw0yMzA0MTYxMDE5MzhaMDQxCzAJ +AwwHUm9vdCBDQTAeFw0yMzA0MTgwODAyNDJaFw0yNDA0MTcwODAyNDJaMDQxCzAJ BgNVBAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEVMBMGA1UEAwwMc2VydmVyLncxLmZp MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/Q5ezRksakGD2SwONs0J sI+yyYzI0gM4blS8Q+7O+Fmx6T9t1F7jxXMZPQu8KdfQbnUANfz3ZbG2D8sGSc+p @@ -78,10 +77,10 @@ c6xGrsvreTZXrcNwAhVt8KVDc6tyBLEWYHQOSsGPUigalX6r0AT2+hHaG9GZpE+e MRBpSdDnMB8GA1UdIwQYMBaAFKT9uTkbgbOq64gd1IGptRFwzKfhMDUGCCsGAQUF BwEBBCkwJzAlBggrBgEFBQcwAYYZaHR0cDovL3NlcnZlci53MS5maTo4ODg4LzAX BgNVHREEEDAOggxzZXJ2ZXIudzEuZmkwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJ -KoZIhvcNAQELBQADggEBAKOc3R2rfXTIvD9MLvenBL+BEbIi2Y+LT4sOAb20C5FL -yDqwsR4BTetWgCksW3mnBpRglQMdX0fRk8WfUZZHk3CTmDiMWWrwPQKNKqMxmJOl -YlDMFTyCGrpOUBNoWfghxYCdtNqE1AENkBIpghHvHeo1ZHplAouRrvhmVpVav8RW -+RI4IGs01MdPCJo83eeXCgois93fkCqjc085qlrvmlcowvvqugvckTPORa88nxCr -7zI1SrASB5FJ6G94/blUB7PTzTuDLxD+y3FYkrmYuaACWhucG20A3MoIEiDnMjNt -LmY6ixpJ77d1eNLBPGtjL5V8BCVjvwKFc+zX2vM1Nqs= +KoZIhvcNAQELBQADggEBAD0d8n3BsEh5rhxckPgpmWBJ/4EMtqCJIeo/kZemJ0Pv +moO8RttdW3/Fwz27PChTfl6jH8oG2nSzS/wfH2Ksg6O3QcFQG9aTsB8kh74IAvJR +mU4MhczfuI2TEs9jrp9HiDZV66/t3gcL+LHoD83+/U5pM9c1PxiVViDfh1iOZGBy +NiFnPW2ZhYYQM3iUsXV1QJizZDgDV+URxxU2TUSW5CLqHId3diogxZpY84X5ILhu +/Ygucwh8Ivvl3vmqfTkcq9m0Nwt2kAruJF5LjD8UOPkfHB/RFUbYzmwTHhViOHJy +69k/qxXo9iiM5+qJdYOuurKTS5phoSOIoJzkOZVfK4Q= -----END CERTIFICATE----- diff --git a/tests/hwsim/auth_serv/server.pkcs12 b/tests/hwsim/auth_serv/server.pkcs12 index 7a4fd697f..a56cd51d9 100644 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 5ce7004ca..3381c8c9c 100644 --- a/tests/hwsim/auth_serv/test-ca/index.txt +++ b/tests/hwsim/auth_serv/test-ca/index.txt @@ -138,3 +138,13 @@ V 230416101938Z D8D3E3A6CBE3CD79 unknown /C=FI/O=w1.fi/CN=server-policies.w1.fi V 230416101938Z D8D3E3A6CBE3CD7A unknown /C=FI/O=w1.fi/CN=server-policies2.w1.fi V 230416101938Z D8D3E3A6CBE3CD7B unknown /C=FI/O=w1.fi/CN=Test User V 230416101938Z D8D3E3A6CBE3CD7C unknown /C=FI/O=w1.fi/CN=ocsp.w1.fi +V 240417080242Z D8D3E3A6CBE3CD7D unknown /C=FI/O=w1.fi/CN=server.w1.fi +V 240417080242Z D8D3E3A6CBE3CD7E unknown /C=FI/O=w1.fi/CN=server3.w1.fi +V 200102000000Z D8D3E3A6CBE3CD7F unknown /C=FI/O=w1.fi/CN=server4.w1.fi +V 240417080242Z D8D3E3A6CBE3CD80 unknown /C=FI/O=w1.fi/CN=server5.w1.fi +V 240417080242Z D8D3E3A6CBE3CD81 unknown /C=FI/O=w1.fi/CN=server6.w1.fi +V 20730405080242Z D8D3E3A6CBE3CD82 unknown /C=FI/O=w1.fi/CN=server7.w1.fi +V 240417080242Z D8D3E3A6CBE3CD83 unknown /C=FI/O=w1.fi/CN=server-policies.w1.fi +V 240417080242Z D8D3E3A6CBE3CD84 unknown /C=FI/O=w1.fi/CN=server-policies2.w1.fi +V 240417080242Z D8D3E3A6CBE3CD85 unknown /C=FI/O=w1.fi/CN=Test User +V 240417080242Z D8D3E3A6CBE3CD86 unknown /C=FI/O=w1.fi/CN=ocsp.w1.fi diff --git a/tests/hwsim/auth_serv/test-ca/serial b/tests/hwsim/auth_serv/test-ca/serial index d8808eb28..60610dbc2 100644 --- a/tests/hwsim/auth_serv/test-ca/serial +++ b/tests/hwsim/auth_serv/test-ca/serial @@ -1 +1 @@ -D8D3E3A6CBE3CD7D +D8D3E3A6CBE3CD87 diff --git a/tests/hwsim/auth_serv/update.sh b/tests/hwsim/auth_serv/update.sh index b2296b2fb..902c556ed 100755 --- a/tests/hwsim/auth_serv/update.sh +++ b/tests/hwsim/auth_serv/update.sh @@ -162,6 +162,8 @@ echo echo "---[ Additional steps ]-------------------------------------------------" echo +rm ca-openssl.cnf.tmp + echo "test_ap_eap.py: ap_wpa2_eap_ttls_server_cert_hash srv_cert_hash" $OPENSSL x509 -in server.pem -out server.der -outform DER diff --git a/tests/hwsim/auth_serv/user.pem b/tests/hwsim/auth_serv/user.pem index e881e487d..305e71775 100644 --- a/tests/hwsim/auth_serv/user.pem +++ b/tests/hwsim/auth_serv/user.pem @@ -2,16 +2,16 @@ Certificate: Data: Version: 3 (0x2) Serial Number: - d8:d3:e3:a6:cb:e3:cd:7b + d8:d3:e3:a6:cb:e3:cd:85 Signature Algorithm: sha256WithRSAEncryption Issuer: C=FI, L=Tuusula, O=w1.fi, CN=Root CA Validity - Not Before: Apr 16 10:19:38 2022 GMT - Not After : Apr 16 10:19:38 2023 GMT + Not Before: Apr 18 08:02:42 2023 GMT + Not After : Apr 17 08:02:42 2024 GMT Subject: C=FI, O=w1.fi, CN=Test User Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:bc:24:08:d9:07:6d:19:0e:94:5c:6b:d9:8a:84: 1b:03:22:e2:1a:06:42:d3:0b:60:8d:5f:31:04:06: @@ -38,33 +38,32 @@ Certificate: X509v3 Subject Key Identifier: FB:85:00:A8:DF:D6:0C:0E:A7:E3:39:61:D9:BE:CE:2A:EF:6D:28:D8 X509v3 Authority Key Identifier: - keyid:A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 - + A4:FD:B9:39:1B:81:B3:AA:EB:88:1D:D4:81:A9:B5:11:70:CC:A7:E1 Authority Information Access: OCSP - URI:http://server.w1.fi:8888/ - X509v3 Extended Key Usage: TLS Web Client Authentication Signature Algorithm: sha256WithRSAEncryption - 34:ee:2e:8f:5e:50:60:f1:45:2e:db:09:07:8c:35:23:24:ee: - 34:8b:d9:16:74:ec:f8:43:14:67:26:1e:e3:c6:11:6b:9e:d5: - 93:a5:50:e0:d6:d4:c9:7c:6b:07:c3:21:5b:2f:78:fe:b5:22: - 3e:69:12:9b:83:3c:93:76:38:62:1b:0e:4b:b9:63:23:97:ac: - a1:d1:80:07:32:d6:51:10:d0:44:78:c8:a7:8a:65:be:a1:8f: - 50:76:80:92:3e:a1:e7:6d:3b:96:0f:a7:2c:24:8d:f2:58:bd: - 6f:15:e2:ec:93:54:22:74:75:b7:b1:6c:29:d1:96:ae:e5:31: - 86:d8:cd:1b:06:84:4c:ce:ab:09:e7:93:41:25:e8:4d:44:29: - c8:63:25:2a:6c:98:99:fd:97:1f:08:7e:ba:b0:1d:2f:90:d5: - 9b:09:62:88:b2:88:ec:07:da:be:0f:c8:5e:42:53:8d:be:39: - fa:21:9f:cb:84:29:38:ab:82:65:1f:3e:97:55:48:04:d4:f8: - eb:27:e1:55:d4:77:62:b4:ae:a1:f7:19:56:e8:32:59:9a:ca: - 98:63:43:9e:b1:71:55:33:f8:9a:c5:e0:c4:6a:09:98:7d:3b: - 9d:f6:2d:f3:4b:e2:2c:37:76:b6:ca:aa:bd:bd:c5:4a:a0:0c: - 57:36:d1:04 + Signature Value: + 3f:b7:e2:46:d1:32:4c:6a:9a:91:1f:00:24:ed:dc:30:23:7f: + 8c:44:5c:ea:ff:f2:07:ff:a7:75:61:73:41:0a:90:a7:dc:42: + e7:89:b0:10:ac:36:cb:4a:d7:fd:7d:cc:9d:d3:18:4e:29:1a: + bb:a8:22:7f:a1:95:83:b8:7d:19:b3:26:17:5b:5b:ed:80:8c: + f7:bd:27:b4:57:6a:b8:5c:49:e3:f7:39:5e:d0:e7:18:e2:ca: + 2f:bc:0f:2a:c5:fb:6e:69:fa:7b:15:df:21:f3:f4:d2:10:bc: + e0:89:51:1b:35:85:a3:bf:47:4f:0d:b8:34:86:66:f0:ee:5a: + 90:49:d2:93:e1:10:f8:b0:fa:93:42:a2:e7:43:0a:c9:69:b5: + f9:d6:b8:cf:58:36:6a:8a:06:24:8f:34:a5:63:77:8e:1c:16: + 30:74:b9:82:72:91:c3:91:0f:68:cf:f0:24:26:d1:c8:b1:3c: + 03:cb:b0:63:62:9a:2b:69:e9:0f:6e:80:39:ff:3c:3e:6b:b6: + d6:be:95:b9:fc:2c:ab:f7:d3:14:d1:c9:b1:53:31:8d:55:d0: + 52:40:52:a0:82:7f:01:4f:24:c1:dd:d3:d2:7f:92:6a:2e:d3: + 41:b7:4f:52:ef:1b:34:b5:08:55:7d:6c:15:f4:4f:cc:18:3b: + 62:f3:61:d5 -----BEGIN CERTIFICATE----- -MIIDkDCCAnigAwIBAgIJANjT46bL4817MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV +MIIDkDCCAnigAwIBAgIJANjT46bL482FMA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV BAYTAkZJMRAwDgYDVQQHDAdUdXVzdWxhMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UE -AwwHUm9vdCBDQTAeFw0yMjA0MTYxMDE5MzhaFw0yMzA0MTYxMDE5MzhaMDExCzAJ +AwwHUm9vdCBDQTAeFw0yMzA0MTgwODAyNDJaFw0yNDA0MTcwODAyNDJaMDExCzAJ BgNVBAYTAkZJMQ4wDAYDVQQKDAV3MS5maTESMBAGA1UEAwwJVGVzdCBVc2VyMIIB IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvCQI2QdtGQ6UXGvZioQbAyLi GgZC0wtgjV8xBAb6okBqDCQpWM2DvzqdfzcNTSdd1VdXHPO+dT86TERvAi9biyyw @@ -75,11 +74,11 @@ HaUhPfA1YpTIzzM/2KJd38xYAAiN7bEExSs/GhX2kgjU8ULNbNvy/+BuaYTYiwID AQABo4GaMIGXMAkGA1UdEwQCMAAwHQYDVR0OBBYEFPuFAKjf1gwOp+M5Ydm+zirv bSjYMB8GA1UdIwQYMBaAFKT9uTkbgbOq64gd1IGptRFwzKfhMDUGCCsGAQUFBwEB BCkwJzAlBggrBgEFBQcwAYYZaHR0cDovL3NlcnZlci53MS5maTo4ODg4LzATBgNV -HSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEANO4uj15QYPFFLtsJ -B4w1IyTuNIvZFnTs+EMUZyYe48YRa57Vk6VQ4NbUyXxrB8MhWy94/rUiPmkSm4M8 -k3Y4YhsOS7ljI5esodGABzLWURDQRHjIp4plvqGPUHaAkj6h5207lg+nLCSN8li9 -bxXi7JNUInR1t7FsKdGWruUxhtjNGwaETM6rCeeTQSXoTUQpyGMlKmyYmf2XHwh+ -urAdL5DVmwliiLKI7Afavg/IXkJTjb45+iGfy4QpOKuCZR8+l1VIBNT46yfhVdR3 -YrSuofcZVugyWZrKmGNDnrFxVTP4msXgxGoJmH07nfYt80viLDd2tsqqvb3FSqAM -VzbRBA== +HSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAP7fiRtEyTGqakR8A +JO3cMCN/jERc6v/yB/+ndWFzQQqQp9xC54mwEKw2y0rX/X3MndMYTikau6gif6GV +g7h9GbMmF1tb7YCM970ntFdquFxJ4/c5XtDnGOLKL7wPKsX7bmn6exXfIfP00hC8 +4IlRGzWFo79HTw24NIZm8O5akEnSk+EQ+LD6k0Ki50MKyWm1+da4z1g2aooGJI80 +pWN3jhwWMHS5gnKRw5EPaM/wJCbRyLE8A8uwY2KaK2npD26AOf88Pmu21r6Vufws +q/fTFNHJsVMxjVXQUkBSoIJ/AU8kwd3T0n+Sai7TQbdPUu8bNLUIVX1sFfRPzBg7 +YvNh1Q== -----END CERTIFICATE----- diff --git a/tests/hwsim/auth_serv/user.pkcs12 b/tests/hwsim/auth_serv/user.pkcs12 index bb76556ab..17466eafe 100644 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 1610bc75d..c1eb62edd 100644 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 8f4eea14e..cbd901f2e 100644 Binary files a/tests/hwsim/auth_serv/user3.pkcs12 and b/tests/hwsim/auth_serv/user3.pkcs12 differ diff --git a/tests/hwsim/test_ap_eap.py b/tests/hwsim/test_ap_eap.py index 12b770818..c3b854d1b 100644 --- a/tests/hwsim/test_ap_eap.py +++ b/tests/hwsim/test_ap_eap.py @@ -2971,7 +2971,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 = "37bbb34133f7a3aa56056aae457a0ec7f55ed59fe8fd71107f8ad4a9c81e339f" + srv_cert_hash = "645830f9c128146bd1420aadc5179ffc4d4f0ef34f63075cefdd7d14a6c5af79" 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", @@ -4416,7 +4416,7 @@ def ocsp_req(outfile): "-reqout", outfile, '-issuer', 'auth_serv/ca.pem', '-sha256', - '-serial', '0xD8D3E3A6CBE3CD73', + '-serial', '0xD8D3E3A6CBE3CD7D', '-no_nonce'] run_openssl(arg) if not os.path.exists(outfile):