[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  d175e8a6c23ca212bf57ff78fdbca6942f3e0ef7 (commit)
      from  dc8980957ba12f49f7656429eda3a7b62c4cbb4c (commit)


- Log -----------------------------------------------------------------
commit d175e8a6c23ca212bf57ff78fdbca6942f3e0ef7
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Oct 12 09:44:15 2015 +0100

    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 at openssl.org>

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

Summary of changes:
 apps/dgst.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/dgst.c b/apps/dgst.c
index 99568f4..1e3a72c 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"},