[Home]Vitenka/Acme-Tiny

www.vitenka.com | ToothyWiki | Vitenka | RecentChanges | Login | Webcomic

I officially give up on github.  I clone the repo to my machine, edit it - and no combination of branches and commits allow me to submit my patchset for consideration.
So here we go.  This copes with /r/n in the challenge-response from letsencrypt; the original only allows /n.


--- acme_tiny.py.orig   2016-12-26 20:02:42.769514300 +0000
+++ acme_tiny.py        2016-12-26 20:15:43.272719100 +0000
@@ -25,7 +25,7 @@
     if proc.returncode != 0:
         raise IOError("OpenSSL Error: {0}".format(err))
     pub_hex, pub_exp = re.search(
-        r"modulus:\n\s+00:([a-f0-9\:\s]+?)\npublicExponent: ([0-9]+)",
+        r"modulus:\s*\n\s+00:([a-f0-9\:\s]+?)\npublicExponent: ([0-9]+)",
         out.decode('utf8'), re.MULTILINE|re.DOTALL).groups()
     pub_exp = "{0:x}".format(int(pub_exp))
     pub_exp = "0{0}".format(pub_exp) if len(pub_exp) % 2 else pub_exp
@@ -72,7 +72,7 @@
     common_name = re.search(r"Subject:.*? CN=([^\s,;/]+)", out.decode('utf8'))
     if common_name is not None:
         domains.add(common_name.group(1))
-    subject_alt_names = re.search(r"X509v3 Subject Alternative Name: \n +([^\n]+)\n", out.decode('utf8'), re.MULTILINE|re.DOTALL)
+    subject_alt_names = re.search(r"X509v3 Subject Alternative Name:\s*\n\s+([^\r\n]+)\r?\n", out.decode('utf8'), re.MULTILINE|re.DOTALL)
     if subject_alt_names is not None:
         for san in subject_alt_names.group(1).split(", "):
             if san.startswith("DNS:"):



www.vitenka.com | ToothyWiki | Vitenka | RecentChanges | Login | Webcomic
This page is read-only | View other revisions | Recently used referrers
Last edited December 26, 2016 8:16 pm (viewing revision 1, which is the newest) (diff)
Search: