From a38369db32b88923282ee360d2bee78fd617e56e Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Thu, 16 Apr 2020 12:07:35 +0200
Subject: [PATCH] s_time: Allow using -CAfile option as in other commands
The s_time command in difference from all the other similar
commands supported -cafile option instead of -CAfile.
Add the -CAfile option and keep -cafile only for backwards
compatibility.
Fixes #11552
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11555)
---
apps/s_time.c | 1 +
doc/man1/s_time.pod | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/apps/s_time.c b/apps/s_time.c
index 82d40a5a51..d52f525eac 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -62,6 +62,7 @@ const OPTIONS s_time_options[] = {
{"key", OPT_KEY, '<', "File with key, PEM; default is -cert file"},
{"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"},
{"cafile", OPT_CAFILE, '<', "PEM format file of CA's"},
+ {"CAfile", OPT_CAFILE, '<', "PEM format file of CA's"},
{"no-CAfile", OPT_NOCAFILE, '-',
"Do not load the default certificates file"},
{"no-CApath", OPT_NOCAPATH, '-',
diff --git a/doc/man1/s_time.pod b/doc/man1/s_time.pod
index ac32f36bc7..85e9b7f627 100644
--- a/doc/man1/s_time.pod
+++ b/doc/man1/s_time.pod
@@ -14,7 +14,7 @@ B<openssl> B<s_time>
[B<-cert filename>]
[B<-key filename>]
[B<-CApath directory>]
-[B<-cafile filename>]
+[B<-CAfile filename>]
[B<-no-CAfile>]
[B<-no-CApath>]
[B<-reuse>]
--
2.25.1