diff options
| author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2015-03-15 16:32:13 -0400 |
|---|---|---|
| committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2015-03-15 16:32:13 -0400 |
| commit | 15111f26d4594a078a017e7fee5b92651c77b2b5 (patch) | |
| tree | ed474b4d39bc0ed87cfc40a33861b8427db0c578 /OpenSSL/SSL.py | |
| parent | 85ce662560419a34cf0fbfb60836e1602a693586 (diff) | |
| parent | 876b2ac5929fd9edcf7c03d1f28ee5334bce60ea (diff) | |
| download | pyopenssl-15111f26d4594a078a017e7fee5b92651c77b2b5.tar.gz | |
merge masterremove-rationale
Diffstat (limited to 'OpenSSL/SSL.py')
| -rw-r--r-- | OpenSSL/SSL.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSSL/SSL.py b/OpenSSL/SSL.py index 7b1cbc1..2731d64 100644 --- a/OpenSSL/SSL.py +++ b/OpenSSL/SSL.py @@ -492,6 +492,9 @@ class Context(object): :return: None (raises an exception if something's wrong) """ + if not _lib.SSL_CTX_check_private_key(self._context): + _raise_current_error() + def load_client_ca(self, cafile): """ @@ -1183,8 +1186,7 @@ class Connection(object): """ result = _lib.SSL_shutdown(self._ssl) if result < 0: - # TODO: This is untested. - _raise_current_error() + self._raise_ssl_error(self._ssl, result) elif result > 0: return True else: |