Skip to content

Commit 1d14000

Browse files
committed
imageio: drop deprecated/removed ssl flags
The versioned SSL flags have been deprecated since Python 3.7. Remove OP_NO_TLSv1 / OP_NO_TLSv1_1 and replace with the new methods to define the minimum TLS version to be used. Signed-off-by: Jean-Louis Dupond <jean-louis@dupond.be>
1 parent edfdf71 commit 1d14000

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

ovirt_imageio/_internal/ssl.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ def server_context(certfile, keyfile, cafile=None, enable_tls1_1=False):
99
# TODO: Verify client certs
1010
ctx = ssl.create_default_context(
1111
purpose=ssl.Purpose.CLIENT_AUTH, cafile=cafile)
12-
ctx.options |= ssl.OP_NO_TLSv1
12+
ctx.minimum_version = ssl.TLSVersion.TLSv1_1
1313
if not enable_tls1_1:
14-
ctx.options |= ssl.OP_NO_TLSv1_1
14+
ctx.minimum_version = ssl.TLSVersion.TLSv1
1515
ctx.load_cert_chain(certfile, keyfile=keyfile)
1616
return ctx
1717

1818

1919
def client_context(cafile=None, enable_tls1_1=False):
2020
ctx = ssl.create_default_context(
2121
purpose=ssl.Purpose.SERVER_AUTH, cafile=cafile)
22-
ctx.options |= ssl.OP_NO_TLSv1
22+
ctx.minimum_version = ssl.TLSVersion.TLSv1_1
2323
if not enable_tls1_1:
24-
ctx.options |= ssl.OP_NO_TLSv1_1
24+
ctx.minimum_version = ssl.TLSVersion.TLSv1
2525
return ctx
2626

2727

0 commit comments

Comments
 (0)