From 35313768c77191a61bd6e34393d89e7b7cd78465 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 26 Feb 2015 19:23:38 +0000 Subject: [PATCH] Make OpenSSL compile with no-rc4 Reviewed-by: Matt Caswell --- apps/dsa.c | 4 ++++ apps/rsa.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/dsa.c b/apps/dsa.c index dedf8e174a..7ff6ee960f 100644 --- a/apps/dsa.c +++ b/apps/dsa.c @@ -113,7 +113,9 @@ int MAIN(int argc, char **argv) char *passin = NULL, *passout = NULL; int modulus = 0; +#ifndef OPENSSL_NO_RC4 int pvk_encr = 2; +#endif apps_startup(); @@ -168,12 +170,14 @@ int MAIN(int argc, char **argv) engine = *(++argv); } # endif +#ifndef OPENSSL_NO_RC4 else if (strcmp(*argv, "-pvk-strong") == 0) pvk_encr = 2; else if (strcmp(*argv, "-pvk-weak") == 0) pvk_encr = 1; else if (strcmp(*argv, "-pvk-none") == 0) pvk_encr = 0; +#endif else if (strcmp(*argv, "-noout") == 0) noout = 1; else if (strcmp(*argv, "-text") == 0) diff --git a/apps/rsa.c b/apps/rsa.c index e13c14fbc8..419e50455a 100644 --- a/apps/rsa.c +++ b/apps/rsa.c @@ -115,8 +115,9 @@ int MAIN(int argc, char **argv) char *engine = NULL; # endif int modulus = 0; - +#ifndef OPENSSL_NO_RC4 int pvk_encr = 2; +#endif apps_startup(); @@ -178,12 +179,14 @@ int MAIN(int argc, char **argv) pubin = 2; else if (strcmp(*argv, "-RSAPublicKey_out") == 0) pubout = 2; +#ifndef OPENSSL_NO_RC4 else if (strcmp(*argv, "-pvk-strong") == 0) pvk_encr = 2; else if (strcmp(*argv, "-pvk-weak") == 0) pvk_encr = 1; else if (strcmp(*argv, "-pvk-none") == 0) pvk_encr = 0; +#endif else if (strcmp(*argv, "-noout") == 0) noout = 1; else if (strcmp(*argv, "-text") == 0) -- 2.25.1