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

added option to set alias for PKCS12

Browse Source
This commit is contained in:
eddyhub 2018-02-18 19:48:08 +01:00
parent d43392628b
commit c09db82b6f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
acme.sh
View File

@ -1211,16 +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]" _usage "Usage: $PROJECT_ENTRY --toPkcs -d domain [--password pfx-password] [--name pfx-name/pfx-alias]"
return 1 return 1
fi fi
_isEcc="$3" _isEcc="$4"
_initpath "$domain" "$_isEcc" _initpath "$domain" "$_isEcc"
_toPkcs "$CERT_PFX_PATH" "$CERT_KEY_PATH" "$CERT_PATH" "$CA_CERT_PATH" "$pfxPassword" _toPkcs "$CERT_PFX_PATH" "$CERT_KEY_PATH" "$CERT_PATH" "$CA_CERT_PATH" "$pfxPassword" "$pfxName"
if [ "$?" = "0" ]; then if [ "$?" = "0" ]; then
_info "Success, Pfx is exported to: $CERT_PFX_PATH" _info "Success, Pfx is exported to: $CERT_PFX_PATH"
@ -5469,6 +5470,7 @@ _process() {
_fullchain_file="" _fullchain_file=""
_reloadcmd="" _reloadcmd=""
_password="" _password=""
_name="1"
_accountconf="" _accountconf=""
_useragent="" _useragent=""
_accountemail="" _accountemail=""
@ -5746,6 +5748,10 @@ _process() {
_password="$2" _password="$2"
shift shift
;; ;;
--name)
_name="$2"
shift
;;
--accountconf) --accountconf)
_accountconf="$2" _accountconf="$2"
ACCOUNT_CONF_PATH="$_accountconf" ACCOUNT_CONF_PATH="$_accountconf"
@ -6016,7 +6022,7 @@ _process() {
uninstallcronjob) uninstallcronjob ;; uninstallcronjob) uninstallcronjob ;;
cron) cron ;; cron) cron ;;
toPkcs) toPkcs)
toPkcs "$_domain" "$_password" "$_ecc" toPkcs "$_domain" "$_password" "$_name" "$_ecc"
;; ;;
toPkcs8) toPkcs8)
toPkcs8 "$_domain" "$_ecc" toPkcs8 "$_domain" "$_ecc"