ervin/acme.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support older style (Windows) CSR headers and footers

Browse Source 
Use grep regular expressions to match older style headers

    -----BEGIN NEW CERTIFICATE REQUEST-----
    ...
    -----END NEW CERTIFICATE REQUEST-----

in addition to the standard

    -----BEGIN CERTIFICATE REQUEST-----
    ...
    -----END CERTIFICATE REQUEST-----

The older style headers are present in CSRs created by Windows certreq.

There is a discussion on the headers here:
https://stackoverflow.com/questions/28628744/is-there-a-spec-for-csr-begin-headers
This commit is contained in:
Brodie Blackburn 2018-01-16 14:09:15 +10:00
parent 45e21d5000
commit 3f31a4870f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
acme.sh
View File

@ -50,8 +50,8 @@ NGINX="nginx:"
NGINX_START="#ACME_NGINX_START" NGINX_START="#ACME_NGINX_START"
NGINX_END="#ACME_NGINX_END" NGINX_END="#ACME_NGINX_END"
BEGIN_CSR="-----BEGIN CERTIFICATE REQUEST-----" BEGIN_CSR="-----BEGIN( NEW)? CERTIFICATE REQUEST-----"
END_CSR="-----END CERTIFICATE REQUEST-----" END_CSR="-----END( NEW)? CERTIFICATE REQUEST-----"
BEGIN_CERT="-----BEGIN CERTIFICATE-----" BEGIN_CERT="-----BEGIN CERTIFICATE-----"
END_CERT="-----END CERTIFICATE-----" END_CERT="-----END CERTIFICATE-----"
@ -798,7 +798,7 @@ _getfile() {
return 1 return 1
fi fi
i="$(grep -n -- "$startline" "$filename" | cut -d : -f 1)" i="$(grep -n -E -- "$startline" "$filename" | cut -d : -f 1)"
if [ -z "$i" ]; then if [ -z "$i" ]; then
_err "Can not find start line: $startline" _err "Can not find start line: $startline"
return 1 return 1
@ -806,7 +806,7 @@ _getfile() {
i="$(_math "$i" + 1)" i="$(_math "$i" + 1)"
_debug i "$i" _debug i "$i"
j="$(grep -n -- "$endline" "$filename" | cut -d : -f 1)" j="$(grep -n -E -- "$endline" "$filename" | cut -d : -f 1)"
if [ -z "$j" ]; then if [ -z "$j" ]; then
_err "Can not find end line: $endline" _err "Can not find end line: $endline"
return 1 return 1