diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-07-02 08:49:54 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-07-16 01:06:48 -0400 |
| commit | 0bc2f365558ed5980ce87d6b2704ca8649ca2a4a (patch) | |
| tree | 65f840378f1c01678812874a251b9c40824c51fa /apps/opt.c | |
| parent | 31d6c0b2b043bad5c63b797a327109eb26ff8d2a (diff) | |
| download | openssl-0bc2f365558ed5980ce87d6b2704ca8649ca2a4a.tar.gz | |
Remove obsolete key formats.
Remove support for RSA_NET and Netscape key format (-keyform n).
Also removed documentation of SGC.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'apps/opt.c')
| -rw-r--r-- | apps/opt.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/apps/opt.c b/apps/opt.c index b81cec4fa7..bfb039e872 100644 --- a/apps/opt.c +++ b/apps/opt.c @@ -256,15 +256,11 @@ int opt_format(const char *s, unsigned long flags, int *result) break; case 'N': case 'n': - if (strcmp(s, "NSS") == 0 || strcmp(s, "nss") == 0) { - if ((flags & OPT_FMT_NSS) == 0) - return opt_format_error(s, flags); - *result = FORMAT_NSS; - } else { - if ((flags & OPT_FMT_NETSCAPE) == 0) - return opt_format_error(s, flags); - *result = FORMAT_NETSCAPE; - } + if ((flags & OPT_FMT_NSS) == 0) + return opt_format_error(s, flags); + if (strcmp(s, "NSS") != 0 && strcmp(s, "nss") != 0) + return opt_format_error(s, flags); + *result = FORMAT_NSS; break; case 'S': case 's': |