From b20acaa3e1ad9957abf7eae2f2557956a23c3e86 Mon Sep 17 00:00:00 2001
From: Matthew Ames <SuperMatt@users.noreply.github.com>
Date: Tue, 17 Nov 2015 09:27:15 +0000
Subject: [PATCH 1/4] Update configuration.py

---
 letsencrypt/configuration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/letsencrypt/configuration.py b/letsencrypt/configuration.py
index 4955655f3..b370c741f 100644
--- a/letsencrypt/configuration.py
+++ b/letsencrypt/configuration.py
@@ -157,6 +157,6 @@ def _check_config_domain_sanity(domains):
     # http://www.mkyong.com/regular-expressions/domain-name-regular-expression-example/
     #  Characters used, domain parts < 63 chars, tld > 1 < 7 chars
     #  first and last char is not "-"
-    fqdn = re.compile("^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,6}$")
+    fqdn = re.compile("^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,12}$")
     if any(True for d in domains if not fqdn.match(d)):
         raise errors.ConfigurationError("Requested domain is not a FQDN")

From 87035283462e050da0012bdea3483d6bc677c7b4 Mon Sep 17 00:00:00 2001
From: Matthew Ames <SuperMatt@users.noreply.github.com>
Date: Tue, 17 Nov 2015 15:45:52 +0000
Subject: [PATCH 2/4] Update configuration.py

---
 letsencrypt/configuration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/letsencrypt/configuration.py b/letsencrypt/configuration.py
index b370c741f..7274a1aea 100644
--- a/letsencrypt/configuration.py
+++ b/letsencrypt/configuration.py
@@ -155,7 +155,7 @@ def _check_config_domain_sanity(domains):
             "Punycode domains are not supported")
     # FQDN checks from
     # http://www.mkyong.com/regular-expressions/domain-name-regular-expression-example/
-    #  Characters used, domain parts < 63 chars, tld > 1 < 7 chars
+    #  Characters used, domain parts < 63 chars, tld > 1 < 13 chars
     #  first and last char is not "-"
     fqdn = re.compile("^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,12}$")
     if any(True for d in domains if not fqdn.match(d)):

From 78733ae0cb282a1b9e759b2d7dd3eaf6dbd7e8ad Mon Sep 17 00:00:00 2001
From: Matthew Ames <SuperMatt@users.noreply.github.com>
Date: Tue, 17 Nov 2015 23:41:26 +0000
Subject: [PATCH 3/4] Changed tld length to be anything over 1 character

---
 letsencrypt/configuration.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/letsencrypt/configuration.py b/letsencrypt/configuration.py
index 7274a1aea..f2d232c22 100644
--- a/letsencrypt/configuration.py
+++ b/letsencrypt/configuration.py
@@ -155,8 +155,8 @@ def _check_config_domain_sanity(domains):
             "Punycode domains are not supported")
     # FQDN checks from
     # http://www.mkyong.com/regular-expressions/domain-name-regular-expression-example/
-    #  Characters used, domain parts < 63 chars, tld > 1 < 13 chars
+    #  Characters used, domain parts < 63 chars, tld > 1 char
     #  first and last char is not "-"
-    fqdn = re.compile("^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,12}$")
+    fqdn = re.compile("^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,}$")
     if any(True for d in domains if not fqdn.match(d)):
         raise errors.ConfigurationError("Requested domain is not a FQDN")

From 1051c451663edcf06c070dabfdf50923a1fb5e3a Mon Sep 17 00:00:00 2001
From: Matthew Ames <SuperMatt@users.noreply.github.com>
Date: Wed, 18 Nov 2015 07:18:20 +0000
Subject: [PATCH 4/4] TLDs cannot be longer than 63 characters

---
 letsencrypt/configuration.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/letsencrypt/configuration.py b/letsencrypt/configuration.py
index f2d232c22..0ea539b5c 100644
--- a/letsencrypt/configuration.py
+++ b/letsencrypt/configuration.py
@@ -155,8 +155,8 @@ def _check_config_domain_sanity(domains):
             "Punycode domains are not supported")
     # FQDN checks from
     # http://www.mkyong.com/regular-expressions/domain-name-regular-expression-example/
-    #  Characters used, domain parts < 63 chars, tld > 1 char
+    #  Characters used, domain parts < 63 chars, tld > 1 < 64 chars
     #  first and last char is not "-"
-    fqdn = re.compile("^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,}$")
+    fqdn = re.compile("^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,63}$")
     if any(True for d in domains if not fqdn.match(d)):
         raise errors.ConfigurationError("Requested domain is not a FQDN")