[openssl] master update
dev at ddvo.net
dev at ddvo.net
Thu Mar 5 18:46:22 UTC 2020
The branch master has been updated
via f07f6e400db6b5839804b47f959d145266d9188c (commit)
from 2ae925f6fe0a48a002f6976da075e2ef5d8d5fae (commit)
- Log -----------------------------------------------------------------
commit f07f6e400db6b5839804b47f959d145266d9188c
Author: Roger Ning <ningning-718 at users.noreply.github.com>
Date: Mon Mar 2 13:35:02 2020 +0800
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 <tmraz at fedoraproject.org>
Reviewed-by: David von Oheimb <david.von.oheimb at siemens.com>
(Merged from https://github.com/openssl/openssl/pull/11215)
-----------------------------------------------------------------------
Summary of changes:
apps/s_client.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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"},
More information about the openssl-commits
mailing list