diff options
| author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2015-03-15 17:35:19 -0400 |
|---|---|---|
| committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2015-03-15 17:35:19 -0400 |
| commit | 1096996f77ef2e68e2d8476f1b9f017264e7d7d2 (patch) | |
| tree | 84d11a4f12534fea499b3388852eb825910bb709 /OpenSSL/SSL.py | |
| parent | 6c8401021d6285444ae14b996b01b3e767e80202 (diff) | |
| parent | b819738ea9277c75bb131b9555e61a394403f3a9 (diff) | |
| download | pyopenssl-1096996f77ef2e68e2d8476f1b9f017264e7d7d2.tar.gz | |
Merge remote-tracking branch 'origin/master' into recv_into
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 b694578..e86d855 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): """ @@ -1222,8 +1225,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: |