From: Matt Caswell <matt@openssl.org>
Date: Mon, 12 Oct 2015 08:44:15 +0000 (+0100)
Subject: Fix option name discrepancy
X-Git-Tag: OpenSSL_1_1_0-pre1~436
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d175e8a6c23ca212bf57ff78fdbca6942f3e0ef7;p=oweals%2Fopenssl.git

Fix option name discrepancy

There used to be options -macopt and -sigopt in <=1.0.2 for the dgst
command line app. These were incorrectly spelled as -macop and -sigop in
master.

RT#4072

Reviewed-by: Andy Polyakov <appro@openssl.org>
---

diff --git a/apps/dgst.c b/apps/dgst.c
index 99568f42a6..1e3a72ccb4 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -109,8 +109,8 @@ OPTIONS dgst_options[] = {
     {"non-fips-allow", OPT_NON_FIPS_ALLOW, '-'},
     {"hmac", OPT_HMAC, 's', "Create hashed MAC with key"},
     {"mac", OPT_MAC, 's', "Create MAC (not neccessarily HMAC)"},
-    {"sigop", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
-    {"macop", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form or key"},
+    {"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
+    {"macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form or key"},
     {"", OPT_DIGEST, '-', "Any supported digest"},
 #ifndef OPENSSL_NO_ENGINE
     {"engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device"},