diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-10-19 00:36:04 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-11-02 10:58:35 +0100 |
| commit | d91d443f0d26262148d1dc9d29f9fdf025b958ca (patch) | |
| tree | 3be6e5b89414bc3806e4f2f7ecdba38bc4a6c4a5 /apps/apps.h | |
| parent | Fix a doc-nit in EVP_PKEY_CTX_ctrl.pod (diff) | |
| download | openssl-d91d443f0d26262148d1dc9d29f9fdf025b958ca.tar.xz openssl-d91d443f0d26262148d1dc9d29f9fdf025b958ca.zip | |
apps: Stop pretending to care about Netscape keys
The documentation says some commands care, but the code says differently.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7440)
Diffstat (limited to 'apps/apps.h')
| -rw-r--r-- | apps/apps.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/apps.h b/apps/apps.h index 5b98d27500..d9eb650eb2 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -369,7 +369,7 @@ typedef struct string_int_pair_st { # define OPT_FMT_SMIME (1L << 3) # define OPT_FMT_ENGINE (1L << 4) # define OPT_FMT_MSBLOB (1L << 5) -# define OPT_FMT_NETSCAPE (1L << 6) +/* (1L << 6) was OPT_FMT_NETSCAPE, but wasn't used */ # define OPT_FMT_NSS (1L << 7) # define OPT_FMT_TEXT (1L << 8) # define OPT_FMT_HTTP (1L << 9) @@ -378,8 +378,8 @@ typedef struct string_int_pair_st { # define OPT_FMT_PDS (OPT_FMT_PEMDER | OPT_FMT_SMIME) # define OPT_FMT_ANY ( \ OPT_FMT_PEMDER | OPT_FMT_PKCS12 | OPT_FMT_SMIME | \ - OPT_FMT_ENGINE | OPT_FMT_MSBLOB | OPT_FMT_NETSCAPE | \ - OPT_FMT_NSS | OPT_FMT_TEXT | OPT_FMT_HTTP | OPT_FMT_PVK) + OPT_FMT_ENGINE | OPT_FMT_MSBLOB | OPT_FMT_NSS | \ + OPT_FMT_TEXT | OPT_FMT_HTTP | OPT_FMT_PVK) char *opt_progname(const char *argv0); char *opt_getprog(void); |