Skip to content

Commit

Permalink
support csr that contains empty CN field. fix #306
Browse files Browse the repository at this point in the history
  • Loading branch information
neil committed Sep 29, 2016
1 parent 59649e9 commit ad752b3
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion acme.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2597,10 +2597,11 @@ signcsr(){
_initpath

_csrsubj=$(_readSubjectFromCSR "$_csrfile")
if [ "$?" != "0" ] || [ -z "$_csrsubj" ] ; then
if [ "$?" != "0" ] ; then
_err "Can not read subject from csr: $_csrfile"
return 1
fi
_debug _csrsubj "$_csrsubj"

_csrdomainlist=$(_readSubjectAltNamesFromCSR "$_csrfile")
if [ "$?" != "0" ] ; then
Expand All @@ -2609,6 +2610,19 @@ signcsr(){
fi
_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")
if [ "$?" != "0" ] || [ -z "$_csrkeylength" ] ; then
_err "Can not read key length from csr: $_csrfile"
Expand Down

0 comments on commit ad752b3

Please sign in to comment.