@@ -78,17 +78,10 @@ def __init__(
7878 self ._port : int = port
7979 self ._source_address : Optional [Tuple [str , int ]] = source_address
8080 self ._use_ssl : bool = use_ssl
81- self ._certfile : Optional [str ] = None
82- self ._keyfile : Optional [str ] = None
83- self ._verify_ssl : bool = True
84- self ._ca_certs : Optional [str ] = None
85-
86- # configure SSL if necessary
87- if self ._use_ssl :
88- self ._certfile = certfile
89- self ._keyfile = keyfile
90- self ._verify_ssl = verify_ssl
91- self ._ca_certs = ca_certs
81+ self ._certfile : Optional [str ] = certfile
82+ self ._keyfile : Optional [str ] = keyfile
83+ self ._verify_ssl : bool = verify_ssl
84+ self ._ca_certs : Optional [str ] = ca_certs
9285
9386 # timeout configuration
9487 self ._server_timeout : float = float (server_timeout or 120 )
@@ -279,13 +272,12 @@ def get_connection_kwargs(self) -> Dict:
279272 keyfile = self ._keyfile ,
280273 )
281274
282- if not self ._verify_ssl :
275+ if self ._verify_ssl and self ._ca_certs is not None :
276+ ssl_context .load_verify_locations (self ._ca_certs )
277+ elif not self ._verify_ssl :
283278 # deactivate SSL verification for hostname & certificate
284279 ssl_context .check_hostname = False
285280 ssl_context .verify_mode = ssl .CERT_NONE
286- else :
287- # verify location if verify_mode is not CERT_NONE
288- ssl_context .load_verify_locations (self ._ca_certs )
289281
290282 return {
291283 'host' : self ._host ,
0 commit comments