3 files changed, 3 insertions, 3 deletions
diff --git a/letsencrypt-helpers/make-combined-crt b/letsencrypt-helpers/make-combined-crt
index 531335f..885ee16 100755
--- a/letsencrypt-helpers/make-combined-crt
+++ b/letsencrypt-helpers/make-combined-crt
@@ -99,7 +99,7 @@ fi
 (
 cat "$chain"
 
-size=$(openssl rsa  < "$cn".key -text -noout | awk -F: '$1 == "Private-Key" {print $2}' | sed -e 's/[^0-9]//g')
+size=$(openssl rsa  < "$cn".key -text -noout | awk -F: '$1 ~ "Private-Key" {print $2}' | sed -r 's/[^0-9]*([0-9]*).*/\1/g')
 if [ -e extra/dh-"$size".pem ]; then
   cat extra/dh-"$size".pem;
 else
diff --git a/letsencrypt-helpers/make-tlsa b/letsencrypt-helpers/make-tlsa
index 1da3001..b7a8da7 100755
--- a/letsencrypt-helpers/make-tlsa
+++ b/letsencrypt-helpers/make-tlsa
@@ -37,7 +37,7 @@ for crt in *-combined.crt; do
 
   (
   openssl x509 -noout -text < "$crt" | awk '/X509v3 Subject Alternative Name/ {getline;gsub(/ /, "", $0); print}' | tr ',' '\n' | awk -F: '$1=="DNS" {print $2}';
-  openssl x509 -noout -subject < "$crt"| sed -e 's/^subject.*CN=\([a-zA-Z0-9\.\-\*]*\).*$/\1/'
+  openssl x509 -noout -subject < "$crt"| sed -e 's/^subject.*CN[[:space:]]*=[[:space:]]*\([a-zA-Z0-9\.\-\*]*\).*$/\1/'
   ) | sort -u | while read cn; do
     for port in $ports; do
       #~/swede/swede create --output rfc --usage=3 --selector=1 --mtype=1 --certificate "$crt" --port "$port" "$cn"
diff --git a/letsencrypt-helpers/request-letsencrypt b/letsencrypt-helpers/request-letsencrypt
index 06bb266..f20dab0 100755
--- a/letsencrypt-helpers/request-letsencrypt
+++ b/letsencrypt-helpers/request-letsencrypt
@@ -43,7 +43,7 @@ tmp="`tempfile`"
 trap "rm -f '$tmp'" EXIT
 
 echo $PATH
-acme --account-key ~/account.key --csr "$cn".csr --acme-dir ~/acme-challenge/ > "$tmp"
+acme --disable-check --account-key ~/account.key --csr "$cn".csr --acme-dir ~/acme-challenge/ > "$tmp"
 if [ -e "$cn-letsencrypt.pem" ]; then
   savelog "$cn-letsencrypt.pem"
 fi