Reenable s_server -dhparam option

[openssl.git] / apps / errstr.c

diff --git a/apps/errstr.c b/apps/errstr.c
index ae7acf52f89dee1560384a1a434dc18d53043c29..8b993fa20ed3f4af915256d21ad864362faeb012 100644 (file)
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -17,16 +17,13 @@
 #include <openssl/ssl.h>
 
 typedef enum OPTION_choice {
-    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
-    OPT_STATS
+    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP
 } OPTION_CHOICE;
 
-OPTIONS errstr_options[] = {
+const OPTIONS errstr_options[] = {
     {OPT_HELP_STR, 1, '-', "Usage: %s [options] errnum...\n"},
     {OPT_HELP_STR, 1, '-', "  errnum  Error number\n"},
     {"help", OPT_HELP, '-', "Display this summary"},
-    {"stats", OPT_STATS, '-',
-     "Print internal hashtable statistics (long!)"},
     {NULL}
 };
 
@@ -48,22 +45,14 @@ int errstr_main(int argc, char **argv)
             opt_help(errstr_options);
             ret = 0;
             goto end;
-        case OPT_STATS:
-            lh_ERR_STRING_DATA_node_stats_bio(ERR_get_string_table(),
-                                              bio_out);
-            lh_ERR_STRING_DATA_stats_bio(ERR_get_string_table(), bio_out);
-            lh_ERR_STRING_DATA_node_usage_stats_bio(ERR_get_string_table(),
-                                                    bio_out);
-            ret = 0;
-            goto end;
         }
     }
 
     ret = 0;
     for (argv = opt_rest(); *argv; argv++) {
-        if (sscanf(*argv, "%lx", &l) == 0)
+        if (sscanf(*argv, "%lx", &l) == 0) {
             ret++;
-        else {
+        } else {
             /* We're not really an SSL application so this won't auto-init, but
              * we're still interested in SSL error strings
              */