[openssl] master update

Dr. Paul Dale pauli at openssl.org
Sun Mar 14 05:42:57 UTC 2021


The branch master has been updated
       via  3711f4c3fbb6344eca6c69c28000ecec3b7dbf7b (commit)
      from  703c4d669d808d9131f241420c3225c1e7db3660 (commit)


- Log -----------------------------------------------------------------
commit 3711f4c3fbb6344eca6c69c28000ecec3b7dbf7b
Author: Tobias Nießen <tniessen at tnie.de>
Date:   Thu Mar 11 23:04:18 2021 +0100

    Fix option description for PKCS#12 export
    
    Refs: https://github.com/openssl/openssl/pull/4930
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14520)

-----------------------------------------------------------------------

Summary of changes:
 apps/pkcs12.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index e3f22c30ed..c5f2981aa7 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -108,7 +108,7 @@ const OPTIONS pkcs12_options[] = {
     {"passcerts", OPT_PASSCERTS, 's', "Certificate file pass phrase source"},
     {"chain", OPT_CHAIN, '-', "Build and add certificate chain for EE cert,"},
     {OPT_MORE_STR, 0, 0,
-     "which is the 1st cert from -in matching the privte key (if given)"},
+     "which is the 1st cert from -in matching the private key (if given)"},
     {"untrusted", OPT_UNTRUSTED, '<', "Untrusted certificates for chain building"},
     {"CAfile", OPT_CAFILE, '<', "PEM-format file of CA's"},
     {"CApath", OPT_CAPATH, '/', "PEM-format directory of CA's"},


More information about the openssl-commits mailing list