plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-25 14:41:40 +00:00
Code Issues Projects Releases Wiki Activity

support csr that contains empty CN field. fix https://github.com/Neilpang/acme.sh/issues/306

Browse Source
This commit is contained in:
neil 2016-09-29 22:19:03 +08:00
parent 59649e9b1e
commit ad752b317d
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
acme.sh
View File

@ -2597,10 +2597,11 @@ signcsr(){
_initpath _initpath
_csrsubj=$(_readSubjectFromCSR "$_csrfile") _csrsubj=$(_readSubjectFromCSR "$_csrfile")
if [ "$?" != "0" ] || [ -z "$_csrsubj" ] ; then if [ "$?" != "0" ] ; then
_err "Can not read subject from csr: $_csrfile" _err "Can not read subject from csr: $_csrfile"
return 1 return 1
fi fi
_debug _csrsubj "$_csrsubj"
_csrdomainlist=$(_readSubjectAltNamesFromCSR "$_csrfile") _csrdomainlist=$(_readSubjectAltNamesFromCSR "$_csrfile")
if [ "$?" != "0" ] ; then if [ "$?" != "0" ] ; then
@ -2609,6 +2610,19 @@ signcsr(){
fi fi
_debug "_csrdomainlist" "$_csrdomainlist" _debug "_csrdomainlist" "$_csrdomainlist"
if [ -z "$_csrsubj" ] ; then
_csrsubj="$(_getfield "$_csrdomainlist" 1)"
_debug _csrsubj "$_csrsubj"
_csrdomainlist="$(echo "$_csrdomainlist" | cut -d , -f 2-)"
_debug "_csrdomainlist" "$_csrdomainlist"
fi
if [ -z "$_csrsubj" ] ; then
_err "Can not read subject from csr: $_csrfile"
return 1
fi
_csrkeylength=$(_readKeyLengthFromCSR "$_csrfile") _csrkeylength=$(_readKeyLengthFromCSR "$_csrfile")
if [ "$?" != "0" ] || [ -z "$_csrkeylength" ] ; then if [ "$?" != "0" ] || [ -z "$_csrkeylength" ] ; then
_err "Can not read key length from csr: $_csrfile" _err "Can not read key length from csr: $_csrfile"