From: Roger Ning Date: Mon, 2 Mar 2020 05:35:02 +0000 (+0800) Subject: fix a minor bug of s_client X-Git-Tag: openssl-3.0.0-alpha1~322 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f07f6e400db6b5839804b47f959d145266d9188c;p=oweals%2Fopenssl.git fix a minor bug of s_client CLA: trivial -CAstore's option should be OPT_CASTORE, instead of OPT_CAFILE correct also -no-CAstore option from OPT_NOCAPATH to OPT_NOCASTORE Reviewed-by: Tomas Mraz Reviewed-by: David von Oheimb (Merged from https://github.com/openssl/openssl/pull/11215) --- diff --git a/apps/s_client.c b/apps/s_client.c index cb2af7edde..7803785018 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -659,12 +659,12 @@ const OPTIONS s_client_options[] = { {"pass", OPT_PASS, 's', "Private key file pass phrase source"}, {"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"}, {"CAfile", OPT_CAFILE, '<', "PEM format file of CA's"}, - {"CAstore", OPT_CAFILE, ':', "URI to store of CA's"}, + {"CAstore", OPT_CASTORE, ':', "URI to store of CA's"}, {"no-CAfile", OPT_NOCAFILE, '-', "Do not load the default certificates file"}, {"no-CApath", OPT_NOCAPATH, '-', "Do not load certificates from the default certificates directory"}, - {"no-CAstore", OPT_NOCAPATH, '-', + {"no-CAstore", OPT_NOCASTORE, '-', "Do not load certificates from the default certificates store"}, {"requestCAfile", OPT_REQCAFILE, '<', "PEM format file of CA names to send to the server"},