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

Rename parameters...

Browse Source
This commit is contained in:
eddyhub 2018-02-19 06:08:26 +01:00
parent c09db82b6f
commit fb7218fce5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
acme.sh
View File

@ -1192,13 +1192,13 @@ _toPkcs() {
_ccert="$3" _ccert="$3"
_cca="$4" _cca="$4"
pfxPassword="$5" pfxPassword="$5"
pfxName="$6" pfxAlias="$6"
pfxCaname="$7" pfxCaname="$7"
if [ "$pfxCaname" ]; then if [ "$pfxCaname" ]; then
${ACME_OPENSSL_BIN:-openssl} pkcs12 -export -out "$_cpfx" -inkey "$_ckey" -in "$_ccert" -certfile "$_cca" -password "pass:$pfxPassword" -name "$pfxName" -caname "$pfxCaname" ${ACME_OPENSSL_BIN:-openssl} pkcs12 -export -out "$_cpfx" -inkey "$_ckey" -in "$_ccert" -certfile "$_cca" -password "pass:$pfxPassword" -name "$pfxAlias" -caname "$pfxCaname"
elif [ "$pfxName" ]; then elif [ "$pfxAlias" ]; then
${ACME_OPENSSL_BIN:-openssl} pkcs12 -export -out "$_cpfx" -inkey "$_ckey" -in "$_ccert" -certfile "$_cca" -password "pass:$pfxPassword" -name "$pfxName" ${ACME_OPENSSL_BIN:-openssl} pkcs12 -export -out "$_cpfx" -inkey "$_ckey" -in "$_ccert" -certfile "$_cca" -password "pass:$pfxPassword" -name "$pfxAlias"
elif [ "$pfxPassword" ]; then elif [ "$pfxPassword" ]; then
${ACME_OPENSSL_BIN:-openssl} pkcs12 -export -out "$_cpfx" -inkey "$_ckey" -in "$_ccert" -certfile "$_cca" -password "pass:$pfxPassword" ${ACME_OPENSSL_BIN:-openssl} pkcs12 -export -out "$_cpfx" -inkey "$_ckey" -in "$_ccert" -certfile "$_cca" -password "pass:$pfxPassword"
else else
@ -1211,17 +1211,17 @@ _toPkcs() {
toPkcs() { toPkcs() {
domain="$1" domain="$1"
pfxPassword="$2" pfxPassword="$2"
pfxName="$3"
if [ -z "$domain" ]; then if [ -z "$domain" ]; then
_usage "Usage: $PROJECT_ENTRY --toPkcs -d domain [--password pfx-password] [--name pfx-name/pfx-alias]" _usage "Usage: $PROJECT_ENTRY --toPkcs -d domain [--password pfx-password] [--pfx-alias pfx-alias]"
return 1 return 1
fi fi
_isEcc="$4" _isEcc="$3"
pfxAlias="$4"
_initpath "$domain" "$_isEcc" _initpath "$domain" "$_isEcc"
_toPkcs "$CERT_PFX_PATH" "$CERT_KEY_PATH" "$CERT_PATH" "$CA_CERT_PATH" "$pfxPassword" "$pfxName" _toPkcs "$CERT_PFX_PATH" "$CERT_KEY_PATH" "$CERT_PATH" "$CA_CERT_PATH" "$pfxPassword" "$pfxAlias"
if [ "$?" = "0" ]; then if [ "$?" = "0" ]; then
_info "Success, Pfx is exported to: $CERT_PFX_PATH" _info "Success, Pfx is exported to: $CERT_PFX_PATH"
@ -5470,7 +5470,7 @@ _process() {
_fullchain_file="" _fullchain_file=""
_reloadcmd="" _reloadcmd=""
_password="" _password=""
_name="1" _pfx_alias="1"
_accountconf="" _accountconf=""
_useragent="" _useragent=""
_accountemail="" _accountemail=""
@ -5748,8 +5748,8 @@ _process() {
_password="$2" _password="$2"
shift shift
;; ;;
--name) --pfx-alias)
_name="$2" _pfx_alias="$2"
shift shift
;; ;;
--accountconf) --accountconf)
@ -6022,7 +6022,7 @@ _process() {
uninstallcronjob) uninstallcronjob ;; uninstallcronjob) uninstallcronjob ;;
cron) cron ;; cron) cron ;;
toPkcs) toPkcs)
toPkcs "$_domain" "$_password" "$_name" "$_ecc" toPkcs "$_domain" "$_password" "$_ecc" "$_pfx_alias"
;; ;;
toPkcs8) toPkcs8)
toPkcs8 "$_domain" "$_ecc" toPkcs8 "$_domain" "$_ecc"