Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 9 additions & 6 deletions kmip/services/kmip_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,13 +285,16 @@ def open(self):
six.reraise(*last_error)

def _create_socket(self, sock):
self.socket = ssl.wrap_socket(
sock,
context = ssl.create_default_context()
context.verify_mode = self.cert_reqs
context.check_hostname = False
context.load_cert_chain(
keyfile=self.keyfile,
certfile=self.certfile,
cert_reqs=self.cert_reqs,
ssl_version=self.ssl_version,
ca_certs=self.ca_certs,
certfile=self.certfile
)
context.load_verify_locations(cafile=self.ca_certs)
self.socket = context.wrap_socket(
sock,
do_handshake_on_connect=self.do_handshake_on_connect,
suppress_ragged_eofs=self.suppress_ragged_eofs)
self.socket.settimeout(self.timeout)
Expand Down
17 changes: 10 additions & 7 deletions kmip/services/server/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,17 +287,20 @@ def interrupt_handler(trigger, frame):
for cipher in auth_suite_ciphers:
self._logger.debug(cipher)

self._socket = ssl.wrap_socket(
self._socket,
keyfile=self.config.settings.get('key_path'),
context = ssl.create_default_context(purpose=ssl.Purpose.CLIENT_AUTH)
context.verify_mode = ssl.CERT_REQUIRED
context.check_hostname = False
context.load_cert_chain(
certfile=self.config.settings.get('certificate_path'),
keyfile=self.config.settings.get('key_path'),
)
context.load_verify_locations(cafile=self.config.settings.get('ca_path'))
context.set_ciphers(self.auth_suite.ciphers)
self._socket = context.wrap_socket(
self._socket,
server_side=True,
cert_reqs=ssl.CERT_REQUIRED,
ssl_version=self.auth_suite.protocol,
ca_certs=self.config.settings.get('ca_path'),
do_handshake_on_connect=False,
suppress_ragged_eofs=True,
ciphers=self.auth_suite.ciphers
)

try:
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,6 @@
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
],
)