diff options
| author | Tony Hutter <[email protected]> | 2023-11-27 13:24:37 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2023-11-28 12:56:09 -0800 |
| commit | 41c4599cba75c5bb18018fdec022a907e5f14ffa (patch) | |
| tree | 0b3fe015e65b9e2da93c755bd59f9090ad90039d /tests | |
| parent | 56a2a0981ed770ed316769d078c892b1e8fa67a9 (diff) | |
ZTS: Fix zfs_load-key failures on F39
The zfs_load-key tests were failing on F39 due to their use of the
deprecated ssl.wrap_socket function. This commit updates the test to
instead use ssl.SSLContext() as described in
https://stackoverflow.com/a/65194957.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tony Hutter <[email protected]>
Closes #15534
Closes #15550
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_common.kshlib | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_common.kshlib b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_common.kshlib index 4a85999b4..f174eeeea 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_common.kshlib +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_common.kshlib @@ -123,7 +123,10 @@ if not httpd: with open('$HTTPS_PORT_FILE', 'w') as portf: print(port, file=portf) -httpd.socket = ssl.wrap_socket(httpd.socket, server_side=True, keyfile='/$TESTPOOL/snakeoil.key', certfile='$SSL_CA_CERT_FILE', ssl_version=ssl.PROTOCOL_TLS) +sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) +sslctx.check_hostname = False +sslctx.load_cert_chain(certfile='$SSL_CA_CERT_FILE', keyfile='/$TESTPOOL/snakeoil.key') +httpd.socket = httpd.socket = sslctx.wrap_socket(httpd.socket, server_side=True) os.chdir('$STF_SUITE/tests/functional/cli_root/zfs_load-key') |