Commit 30baf2b0 authored by Georg Brandl's avatar Georg Brandl

Fix NameErrors.

parent 5684a9ac
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
import re import re
import os import os
import ssl
import sys import sys
import tempfile import tempfile
...@@ -38,7 +37,8 @@ def fetch_server_certificate (host, port): ...@@ -38,7 +37,8 @@ def fetch_server_certificate (host, port):
status, output = subproc(r'openssl x509 -in "%s" -out "%s"' % status, output = subproc(r'openssl x509 -in "%s" -out "%s"' %
(tn, tn2)) (tn, tn2))
if status != 0: if status != 0:
raise OperationError(status, tsig, output) raise RuntimeError('OpenSSL x509 failed with status %s and '
'output: %r' % (status, output))
fp = open(tn2, 'rb') fp = open(tn2, 'rb')
data = fp.read() data = fp.read()
fp.close() fp.close()
...@@ -63,7 +63,8 @@ def fetch_server_certificate (host, port): ...@@ -63,7 +63,8 @@ def fetch_server_certificate (host, port):
'openssl s_client -connect "%s:%s" -showcerts < /dev/null' % 'openssl s_client -connect "%s:%s" -showcerts < /dev/null' %
(host, port)) (host, port))
if status != 0: if status != 0:
raise OSError(status) raise RuntimeError('OpenSSL connect failed with status %s and '
'output: %r' % (status, output))
certtext = strip_to_x509_cert(output) certtext = strip_to_x509_cert(output)
if not certtext: if not certtext:
raise ValueError("Invalid response received from server at %s:%s" % raise ValueError("Invalid response received from server at %s:%s" %
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment