Merge f602593f40 into a8f252e45d
This commit is contained in:
commit
1f662971b8
3
acme.sh
3
acme.sh
@ -1440,6 +1440,7 @@ _toPkcs() {
|
|||||||
toPkcs() {
|
toPkcs() {
|
||||||
domain="$1"
|
domain="$1"
|
||||||
pfxPassword="$2"
|
pfxPassword="$2"
|
||||||
|
pfxName="$1" # use domain as frindlyName
|
||||||
if [ -z "$domain" ]; then
|
if [ -z "$domain" ]; then
|
||||||
_usage "Usage: $PROJECT_ENTRY --to-pkcs12 --domain <domain.tld> [--password <password>] [--ecc]"
|
_usage "Usage: $PROJECT_ENTRY --to-pkcs12 --domain <domain.tld> [--password <password>] [--ecc]"
|
||||||
return 1
|
return 1
|
||||||
@ -1449,7 +1450,7 @@ toPkcs() {
|
|||||||
|
|
||||||
_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"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user