diff --git a/tests/hwsim/auth_serv/ocsp-server-cache.der b/tests/hwsim/auth_serv/ocsp-server-cache.der index 650731d34..33e675311 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.pem b/tests/hwsim/auth_serv/server.pem index 6c00dcf2a..fa3e0ae0c 100644 --- a/tests/hwsim/auth_serv/server.pem +++ b/tests/hwsim/auth_serv/server.pem @@ -1,12 +1,12 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: 15624081837803162823 (0xd8d3e3a6cbe3ccc7) - Signature Algorithm: sha1WithRSAEncryption + Serial Number: 15624081837803162832 (0xd8d3e3a6cbe3ccd0) + Signature Algorithm: sha256WithRSAEncryption Issuer: C=FI, O=w1.fi, CN=Root CA Validity - Not Before: Sep 29 16:02:03 2013 GMT - Not After : Sep 29 16:02:03 2014 GMT + Not Before: Sep 29 21:11:22 2014 GMT + Not After : Sep 29 21:11:22 2015 GMT Subject: C=FI, O=w1.fi, CN=server.w1.fi Subject Public Key Info: Public Key Algorithm: rsaEncryption @@ -37,19 +37,19 @@ Certificate: DNS:server.w1.fi X509v3 Extended Key Usage: TLS Web Server Authentication - Signature Algorithm: sha1WithRSAEncryption - a9:b3:cc:e7:b7:5e:fa:88:46:c9:21:97:47:f5:18:9e:1d:5c: - 8f:d9:78:51:7f:d8:e8:9d:e4:b1:d0:74:68:67:d3:dc:84:56: - 21:7e:a3:ca:ba:97:e9:74:0a:b1:8f:e3:6a:7c:cc:f8:8c:cf: - 73:34:27:3f:f5:ac:e6:c4:13:86:b7:86:fb:d0:19:49:ff:55: - 28:8e:dc:56:a5:17:fa:8f:43:ef:72:d3:21:00:a2:92:74:b8: - b3:b8:38:4a:2a:01:98:5a:c7:a4:02:f2:43:af:e5:d9:52:3a: - fd:e1:24:ac:33:f4:99:e5:c0:1d:aa:29:b6:c4:a0:e9:6a:a6: - 99:0a + Signature Algorithm: sha256WithRSAEncryption + 92:b7:19:2f:15:84:00:c6:68:01:ba:96:67:11:df:7d:0c:1e: + 45:eb:59:e5:64:ad:db:f0:23:ce:22:af:a0:35:a2:6f:99:96: + 9d:2d:bc:b5:8d:58:36:c7:71:f4:fb:c8:a5:e8:44:45:52:7e: + 1e:44:dd:99:3b:1c:40:f1:f7:73:ec:f9:b7:fc:06:cc:a9:a5: + 37:41:d1:20:2b:b5:93:75:26:1b:46:2e:3d:25:a3:5e:e9:7e: + 73:37:9d:e7:71:6f:bb:21:22:cc:31:3e:a2:3f:18:05:ca:35: + d2:98:b8:53:6b:92:ac:73:10:8d:8a:09:a4:e3:46:ad:28:72: + ab:51 -----BEGIN CERTIFICATE----- -MIIClTCCAf6gAwIBAgIJANjT46bL48zHMA0GCSqGSIb3DQEBBQUAMC8xCzAJBgNV -BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xMzA5 -MjkxNjAyMDNaFw0xNDA5MjkxNjAyMDNaMDQxCzAJBgNVBAYTAkZJMQ4wDAYDVQQK +MIIClTCCAf6gAwIBAgIJANjT46bL48zQMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV +BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xNDA5 +MjkyMTExMjJaFw0xNTA5MjkyMTExMjJaMDQxCzAJBgNVBAYTAkZJMQ4wDAYDVQQK DAV3MS5maTEVMBMGA1UEAwwMc2VydmVyLncxLmZpMIGfMA0GCSqGSIb3DQEBAQUA A4GNADCBiQKBgQC6oHdVIhSFVWWbZCyt7ZvdZTHJ2mBQzjjWNNzovBueMOcS41Ns ye1IA3mBaZjOirh3RzZFz8bg8XsecYlU9wHMIq2gQrGoNZ5gqjqYUdD/H+6+jQpj @@ -58,7 +58,7 @@ o4GzMIGwMAkGA1UdEwQCMAAwHQYDVR0OBBYEFDFPEFxnn75OiNbcxaueEoiGaQJP MB8GA1UdIwQYMBaAFLiS3v2KGLMww59V8zNdtMgpikEUMDUGCCsGAQUFBwEBBCkw JzAlBggrBgEFBQcwAYYZaHR0cDovL3NlcnZlci53MS5maTo4ODg4LzAXBgNVHREE EDAOggxzZXJ2ZXIudzEuZmkwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcN -AQEFBQADgYEAqbPM57de+ohGySGXR/UYnh1cj9l4UX/Y6J3ksdB0aGfT3IRWIX6j -yrqX6XQKsY/janzM+IzPczQnP/Ws5sQThreG+9AZSf9VKI7cVqUX+o9D73LTIQCi -knS4s7g4SioBmFrHpALyQ6/l2VI6/eEkrDP0meXAHaoptsSg6WqmmQo= +AQELBQADgYEAkrcZLxWEAMZoAbqWZxHffQweRetZ5WSt2/AjziKvoDWib5mWnS28 +tY1YNsdx9PvIpehERVJ+HkTdmTscQPH3c+z5t/wGzKmlN0HRICu1k3UmG0YuPSWj +Xul+czed53FvuyEizDE+oj8YBco10pi4U2uSrHMQjYoJpONGrShyq1E= -----END CERTIFICATE----- diff --git a/tests/hwsim/auth_serv/server.pkcs12 b/tests/hwsim/auth_serv/server.pkcs12 index 0f5aa553a..7061fd77c 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/user.pem b/tests/hwsim/auth_serv/user.pem index b2cfef78e..4bc2e1ae2 100644 --- a/tests/hwsim/auth_serv/user.pem +++ b/tests/hwsim/auth_serv/user.pem @@ -1,12 +1,12 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: 15624081837803162824 (0xd8d3e3a6cbe3ccc8) - Signature Algorithm: sha1WithRSAEncryption + Serial Number: 15624081837803162833 (0xd8d3e3a6cbe3ccd1) + Signature Algorithm: sha256WithRSAEncryption Issuer: C=FI, O=w1.fi, CN=Root CA Validity - Not Before: Sep 29 16:04:21 2013 GMT - Not After : Sep 29 16:04:21 2014 GMT + Not Before: Sep 29 21:13:00 2014 GMT + Not After : Sep 29 21:13:00 2015 GMT Subject: C=FI, O=w1.fi, CN=Test User Subject Public Key Info: Public Key Algorithm: rsaEncryption @@ -35,19 +35,19 @@ Certificate: X509v3 Extended Key Usage: TLS Web Client Authentication - Signature Algorithm: sha1WithRSAEncryption - 6a:81:f0:61:9e:79:2f:39:cc:3a:e3:29:ed:51:35:59:64:c3: - 7d:f9:2d:27:83:20:eb:4a:fa:94:37:ee:9d:c2:69:47:ed:f5: - 91:95:e2:2a:75:f9:4c:99:5e:e0:b1:98:9b:af:fe:ba:1e:86: - 49:88:12:ac:26:30:81:bb:e7:61:6b:6f:b3:e3:13:06:27:35: - 3b:15:7a:cb:f5:83:53:cc:7f:83:ae:36:18:f2:1f:b7:b8:f4: - 16:e3:4c:e5:43:84:ee:b8:e5:47:02:60:37:1f:a3:41:74:8f: - db:0f:f8:d7:87:fa:24:65:ca:1a:54:9a:a7:d4:5c:79:7b:70: - de:52 + Signature Algorithm: sha256WithRSAEncryption + 76:24:5a:f8:de:ef:8b:65:02:67:ab:8f:3a:42:88:22:35:40: + 48:df:97:91:9b:5a:d4:60:af:61:ef:53:7a:2c:76:04:5f:80: + 27:79:7e:1f:0a:ed:ab:71:0c:6e:90:7a:69:04:4e:21:cb:31: + 47:ee:e9:36:87:a9:f4:a1:dd:e9:8a:fd:41:cc:d2:ae:dd:47: + 66:d1:71:08:b2:e8:5e:e3:36:9e:98:c8:66:51:5b:41:95:02: + 29:fd:b6:46:d2:40:ec:0e:46:40:92:b1:b7:e2:28:6e:85:17: + 1e:8d:52:40:c8:20:ca:9b:ab:f0:10:30:8c:0b:5d:91:91:8c: + ff:ca -----BEGIN CERTIFICATE----- -MIICeTCCAeKgAwIBAgIJANjT46bL48zIMA0GCSqGSIb3DQEBBQUAMC8xCzAJBgNV -BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xMzA5 -MjkxNjA0MjFaFw0xNDA5MjkxNjA0MjFaMDExCzAJBgNVBAYTAkZJMQ4wDAYDVQQK +MIICeTCCAeKgAwIBAgIJANjT46bL48zRMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV +BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xNDA5 +MjkyMTEzMDBaFw0xNTA5MjkyMTEzMDBaMDExCzAJBgNVBAYTAkZJMQ4wDAYDVQQK DAV3MS5maTESMBAGA1UEAwwJVGVzdCBVc2VyMIGfMA0GCSqGSIb3DQEBAQUAA4GN ADCBiQKBgQCmli6bIozflL6LiUn2eHaiYH4UlfOW/qsZJQM0ZHQBPqiffPFHYWBM gpIofCugDsuHv1nr1/NhIjsU86sx9lqVH7h6uCw8qWFTeJvoPlDswtZE50PNvD5O @@ -55,8 +55,8 @@ gpIofCugDsuHv1nr1/NhIjsU86sx9lqVH7h6uCw8qWFTeJvoPlDswtZE50PNvD5O MIGXMAkGA1UdEwQCMAAwHQYDVR0OBBYEFIHe3+laABrKZ9YG3WWyTsWaBEN9MB8G A1UdIwQYMBaAFLiS3v2KGLMww59V8zNdtMgpikEUMDUGCCsGAQUFBwEBBCkwJzAl BggrBgEFBQcwAYYZaHR0cDovL3NlcnZlci53MS5maTo4ODg4LzATBgNVHSUEDDAK -BggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOBgQBqgfBhnnkvOcw64yntUTVZZMN9 -+S0ngyDrSvqUN+6dwmlH7fWRleIqdflMmV7gsZibr/66HoZJiBKsJjCBu+dha2+z -4xMGJzU7FXrL9YNTzH+DrjYY8h+3uPQW40zlQ4TuuOVHAmA3H6NBdI/bD/jXh/ok -ZcoaVJqn1Fx5e3DeUg== +BggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOBgQB2JFr43u+LZQJnq486QogiNUBI +35eRm1rUYK9h71N6LHYEX4AneX4fCu2rcQxukHppBE4hyzFH7uk2h6n0od3piv1B +zNKu3Udm0XEIsuhe4zaemMhmUVtBlQIp/bZG0kDsDkZAkrG34ihuhRcejVJAyCDK +m6vwEDCMC12RkYz/yg== -----END CERTIFICATE----- diff --git a/tests/hwsim/auth_serv/user.pkcs12 b/tests/hwsim/auth_serv/user.pkcs12 index 552476144..9e0ced04b 100644 Binary files a/tests/hwsim/auth_serv/user.pkcs12 and b/tests/hwsim/auth_serv/user.pkcs12 differ diff --git a/tests/hwsim/test_ap_eap.py b/tests/hwsim/test_ap_eap.py index 0ea204525..52db307d9 100644 --- a/tests/hwsim/test_ap_eap.py +++ b/tests/hwsim/test_ap_eap.py @@ -1423,7 +1423,7 @@ def test_ap_wpa2_eap_unauth_tls(dev, apdev): def test_ap_wpa2_eap_ttls_server_cert_hash(dev, apdev): """WPA2-Enterprise connection using EAP-TTLS and server certificate hash""" - srv_cert_hash = "0a3f81f63569226657a069855bb13f3b922670437a2b87585a4734f70ac7315b" + srv_cert_hash = "1477c9cd88391609444b83eca45c4f9f324e3051c5c31fc233ac6aede30ce7cd" params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap") hostapd.add_ap(apdev[0]['ifname'], params) dev[0].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TTLS",