diff options
| author | Viktor Szakats <vszakats@users.noreply.github.com> | 2016-07-30 02:34:19 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-07-30 10:46:22 -0400 |
| commit | e5452d40be3954a12b62fa8ce6746e8a792216e1 (patch) | |
| tree | 401cc987cb64f1e763962862f3411e35669617f5 /apps | |
| parent | 58c27c207ddf0f8bf20c18e1298831e7b7381b02 (diff) | |
rsa.c: fix incorrect guard for pvk-* options
This update syncs the #if guard protecting the pvk-* options
with the rest of the source handling those options. Also fix
some nearby whitespace.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1365)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/rsa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/rsa.c b/apps/rsa.c index 63e88e6762..203e6b96e4 100644 --- a/apps/rsa.c +++ b/apps/rsa.c @@ -50,7 +50,7 @@ OPTIONS rsa_options[] = { {"modulus", OPT_MODULUS, '-', "Print the RSA key modulus"}, {"check", OPT_CHECK, '-', "Verify key consistency"}, {"", OPT_CIPHER, '-', "Any supported cipher"}, -# ifdef OPENSSL_NO_RC4 +# if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_RC4) {"pvk-strong", OPT_PVK_STRONG, '-'}, {"pvk-weak", OPT_PVK_WEAK, '-'}, {"pvk-none", OPT_PVK_NONE, '-'}, @@ -74,7 +74,7 @@ int rsa_main(int argc, char **argv) int noout = 0, modulus = 0, pubin = 0, pubout = 0, ret = 1; # if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_RC4) int pvk_encr = 2; -#endif +# endif OPTION_CHOICE o; prog = opt_init(argc, argv, rsa_options); @@ -134,12 +134,12 @@ int rsa_main(int argc, char **argv) case OPT_PVK_NONE: pvk_encr = 0; break; -#else +# else case OPT_PVK_STRONG: case OPT_PVK_WEAK: case OPT_PVK_NONE: break; -#endif +# endif case OPT_NOOUT: noout = 1; break; |