/*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the OpenSSL license (the "License"). You may not use
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
#include <stdlib.h>
#include <string.h>
#include "apps.h"
+#include "progs.h"
#include <openssl/bio.h>
-#include <openssl/lhash.h>
#include <openssl/err.h>
#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"},
+
+ OPT_SECTION("General"),
{"help", OPT_HELP, '-', "Display this summary"},
- {"stats", OPT_STATS, '-',
- "Print internal hashtable statistics (long!)"},
+
+ OPT_PARAMETERS(),
+ {"errnum", 0, 0, "Error number(s) to decode"},
{NULL}
};
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
*/
OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS
| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
- ERR_error_string_n(l, buf, sizeof buf);
+ ERR_error_string_n(l, buf, sizeof(buf));
BIO_printf(bio_out, "%s\n", buf);
}
}
end:
- return (ret);
+ return ret;
}