Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Remove ssl_version field from client to fix more dependency warnings #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bnoonan-cloudian merged 7 commits into from
Sep 18, 2025
Merged

Remove ssl_version field from client to fix more dependency warnings #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55f1f8a
try that one
bnoonan-cloudian Sep 17, 2025
58a0723
that?
bnoonan-cloudian Sep 17, 2025
6807824
remove it
bnoonan-cloudian Sep 17, 2025
dc32ae8
hostname
bnoonan-cloudian Sep 18, 2025
2babcdd
different context
bnoonan-cloudian Sep 18, 2025
6ac3fcd
go back and force check off
bnoonan-cloudian Sep 18, 2025
e673a9b
clean
bnoonan-cloudian Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions kmip/pie/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ def __init__(self,
cert=None,
key=None,
ca=None,
ssl_version=None,
username=None,
password=None,
config='client',
Expand All @@ -81,9 +80,6 @@ def __init__(self,
Optional, defaults to None.
ca (string): The path to the CA certificate used to verify the
server's certificate. Optional, defaults to None.
ssl_version (string): The name of the ssl version to use for the
connection. Example: 'PROTOCOL_SSLv23'. Optional, defaults to
None.
username (string): The username of the KMIP appliance account to
use for operations. Optional, defaults to None.
password (string): The password of the KMIP appliance account to
Expand Down Expand Up @@ -112,7 +108,6 @@ def __init__(self,
certfile=cert,
keyfile=key,
ca_certs=ca,
ssl_version=ssl_version,
username=username,
password=password,
config=config,
Expand Down
15 changes: 5 additions & 10 deletions kmip/services/kmip_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class KMIPProxy(object):

def __init__(self, host=None, port=None, keyfile=None,
certfile=None,
cert_reqs=None, ssl_version=None, ca_certs=None,
cert_reqs=None, ca_certs=None,
do_handshake_on_connect=None,
suppress_ragged_eofs=None,
username=None, password=None, timeout=30, config='client',
Expand Down Expand Up @@ -109,7 +109,7 @@ def __init__(self, host=None, port=None, keyfile=None,
)

self._set_variables(host, port, keyfile, certfile,
cert_reqs, ssl_version, ca_certs,
cert_reqs, ca_certs,
do_handshake_on_connect, suppress_ragged_eofs,
username, password, timeout, config_file)
self.batch_items = []
Expand Down Expand Up @@ -254,9 +254,6 @@ def open(self):
self.logger.debug(
"KMIPProxy cert_reqs: {0} (CERT_REQUIRED: {1})".format(
self.cert_reqs, ssl.CERT_REQUIRED))
self.logger.debug(
"KMIPProxy ssl_version: {0} (PROTOCOL_SSLv23: {1})".format(
self.ssl_version, ssl.PROTOCOL_SSLv23))
self.logger.debug("KMIPProxy ca_certs: {0}".format(self.ca_certs))
self.logger.debug("KMIPProxy do_handshake_on_connect: {0}".format(
self.do_handshake_on_connect))
Expand Down Expand Up @@ -285,12 +282,13 @@ def open(self):
six.reraise(*last_error)

def _create_socket(self, sock):
context = ssl.SSLContext(self.ssl_version)
context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
context.load_cert_chain(
keyfile=self.keyfile,
certfile=self.certfile)
context.verify_mode = self.cert_reqs
context.load_verify_locations(cafile=self.ca_certs)
context.check_hostname = False
self.socket = context.wrap_socket(
sock,
do_handshake_on_connect=self.do_handshake_on_connect,
Expand Down Expand Up @@ -1737,7 +1735,7 @@ def _send_and_receive_message(self, request):
return response

def _set_variables(self, host, port, keyfile, certfile,
cert_reqs, ssl_version, ca_certs,
cert_reqs, ca_certs,
do_handshake_on_connect, suppress_ragged_eofs,
username, password, timeout, config_file):
conf = ConfigHelper(config_file)
Expand All @@ -1762,9 +1760,6 @@ def _set_variables(self, host, port, keyfile, certfile,
self.cert_reqs = getattr(ssl, conf.get_valid_value(
cert_reqs, self.config, 'cert_reqs', 'CERT_REQUIRED'))

self.ssl_version = getattr(ssl, conf.get_valid_value(
ssl_version, self.config, 'ssl_version', conf.DEFAULT_SSL_VERSION))

self.ca_certs = conf.get_valid_value(
ca_certs, self.config, 'ca_certs', conf.DEFAULT_CA_CERTS)

Expand Down
3 changes: 1 addition & 2 deletions kmip/tests/unit/services/test_kmip_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,6 @@ def test_host_list_import_string(self):
keyfile=None,
certfile=None,
cert_reqs=None,
ssl_version=None,
ca_certs=None,
do_handshake_on_connect=False,
suppress_ragged_eofs=None,
Expand All @@ -729,7 +728,7 @@ def test_host_is_invalid_input(self):
expected_error = TypeError

kwargs = {'host': host, 'port': None, 'keyfile': None,
'certfile': None, 'cert_reqs': None, 'ssl_version': None,
'certfile': None, 'cert_reqs': None,
'ca_certs': None, 'do_handshake_on_connect': False,
'suppress_ragged_eofs': None, 'username': None,
'password': None, 'timeout': None}
Expand Down
Loading