Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
cd9fb3b6
Commit
cd9fb3b6
authored
Jan 16, 2018
by
neilpang
Browse files
fix
https://github.com/Neilpang/acme.sh/issues/1189
parent
9e9f839d
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
cd9fb3b6
...
@@ -2259,6 +2259,8 @@ _initAPI() {
...
@@ -2259,6 +2259,8 @@ _initAPI() {
#[domain] [keylength or isEcc flag]
#[domain] [keylength or isEcc flag]
_initpath() {
_initpath() {
domain="$1"
_ilength="$2"
__initHome
__initHome
...
@@ -2346,13 +2348,10 @@ _initpath() {
...
@@ -2346,13 +2348,10 @@ _initpath() {
ACME_OPENSSL_BIN="$DEFAULT_OPENSSL_BIN"
ACME_OPENSSL_BIN="$DEFAULT_OPENSSL_BIN"
fi
fi
if
[
-z
"
$
1
"
]
;
then
if [ -z "$
domain
" ]; then
return 0
return 0
fi
fi
domain
=
"
$1
"
_ilength
=
"
$2
"
if [ -z "$DOMAIN_PATH" ]; then
if [ -z "$DOMAIN_PATH" ]; then
domainhome="$CERT_HOME/$domain"
domainhome="$CERT_HOME/$domain"
domainhomeecc="$CERT_HOME/$domain$ECC_SUFFIX"
domainhomeecc="$CERT_HOME/$domain$ECC_SUFFIX"
...
@@ -4234,8 +4233,6 @@ signcsr() {
...
@@ -4234,8 +4233,6 @@ signcsr() {
return 1
return 1
fi
fi
_initpath
_csrsubj=$(_readSubjectFromCSR "$_csrfile")
_csrsubj=$(_readSubjectFromCSR "$_csrfile")
if [ "$?" != "0" ]; then
if [ "$?" != "0" ]; then
_err "Can not read subject from csr: $_csrfile"
_err "Can not read subject from csr: $_csrfile"
...
@@ -4272,6 +4269,9 @@ signcsr() {
...
@@ -4272,6 +4269,9 @@ signcsr() {
return 1
return 1
fi
fi
if [ -z "$ACME_VERSION" ] && _contains "$_csrsubj,$_csrdomainlist" "*."; then
export ACME_VERSION=2
fi
_initpath "$_csrsubj" "$_csrkeylength"
_initpath "$_csrsubj" "$_csrkeylength"
mkdir -p "$DOMAIN_PATH"
mkdir -p "$DOMAIN_PATH"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment