Port the easy cases of SSL.py to _openssl_assert (#499)
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
index 8dfa0ed..5eea271 100644
--- a/src/OpenSSL/SSL.py
+++ b/src/OpenSSL/SSL.py
@@ -561,9 +561,7 @@
:return: None
"""
set_result = _lib.SSL_CTX_set_default_verify_paths(self._context)
- if not set_result:
- # TODO: This is untested.
- _raise_current_error()
+ _openssl_assert(set_result == 1)
def use_certificate_chain_file(self, certfile):
"""
@@ -890,9 +888,7 @@
add_result = _lib.SSL_CTX_add_client_CA(
self._context, certificate_authority._x509)
- if not add_result:
- # TODO: This is untested.
- _raise_current_error()
+ _openssl_assert(add_result == 1)
def set_timeout(self, timeout):
"""
@@ -1129,9 +1125,7 @@
self._socket = socket
set_result = _lib.SSL_set_fd(
self._ssl, _asFileDescriptor(self._socket))
- if not set_result:
- # TODO: This is untested.
- _raise_current_error()
+ _openssl_assert(set_result == 1)
def __getattr__(self, name):
"""