encode to bytes as necessary in Validator.certificate (#4026)

2 files changed, 11 insertions, 1 deletions

diff --git a/certbot-compatibility-test/certbot_compatibility_test/validator.py b/certbot-compatibility-test/certbot_compatibility_test/validator.py
index 333b47296..62dd466a1 100644
--- a/certbot-compatibility-test/certbot_compatibility_test/validator.py
+++ b/certbot-compatibility-test/certbot_compatibility_test/validator.py
@@ -4,6 +4,8 @@ import socket
 import requests
 import zope.interface
 
+import six
+
 from acme import crypto_util
 from acme import errors as acme_errors
 from certbot import interfaces
@@ -19,7 +21,14 @@ class Validator(object):
 
     def certificate(self, cert, name, alt_host=None, port=443):
         """Verifies the certificate presented at name is cert"""
-        host = alt_host if alt_host else socket.gethostbyname(name)
+        if alt_host is None:
+            host = socket.gethostbyname(name)
+        elif isinstance(alt_host, six.binary_type):
+            host = alt_host
+        else:
+            host = alt_host.encode()
+        name = name if isinstance(name, six.binary_type) else name.encode()
+
         try:
             presented_cert = crypto_util.probe_sni(name, host, port)
         except acme_errors.Error as error:
diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py
index fa49d9f3d..e515ede7b 100644
--- a/certbot-compatibility-test/setup.py
+++ b/certbot-compatibility-test/setup.py
@@ -9,6 +9,7 @@ version = '0.11.0.dev0'
 install_requires = [
     'certbot',
     'certbot-apache',
+    'six',
     'requests',
     'zope.interface',
 ]