diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index 775a128f8..19ec4e71b 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -335,7 +335,21 @@ cmd_help() { (Equivalent to global option '--nopass|--no-pass') * noca - Do not include the ca.crt file in the PKCS12 output * nokey - Do not include the private key in the PKCS12 output - * usefn - Use as friendly name" + * nofn - Do not set 'freindlyName' + For more, see: 'easyrsa help friendly'" + ;; + friendly) + text_only=1 + text=" +* export-p12: Internal file label 'friendlyName' + + The 'friendlyname' is always set to the file-name-base. + + An alternate friendlyName can be configured by using: + * Global option '--usefn=' + + Fallback to previous behavior can be configured by using: + * Command option 'nofn' ('friendlyname' will not be set)" ;; export-p7) text=" @@ -566,10 +580,14 @@ Certificate & Request options: (these impact cert/req field values) --subca-len=# : Path length of signed intermediate CA certificates --copy-ext : Copy included request X509 extensions (namely subjAltName) + --san|--subject-alt-name= : Add a subjectAltName. For more info and syntax, see: 'easyrsa help altname' +--usefn=NAME : export-p12, set 'friendlyName' to NAME + For more, see: 'easyrsa help friendly' + Distinguished Name mode: --dn-mode=MODE : Distinguished Name mode to use 'cn_only' (Default) or 'org'