generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make OpenSSL compile with no-rc4

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-02-26 19:23:38 +00:00
parent 7a6c979242
commit 35313768c7
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dsa.c
View File

@ -113,7 +113,9 @@ int MAIN(int argc, char **argv)
char *passin = NULL, *passout = NULL; char *passin = NULL, *passout = NULL;
int modulus = 0; int modulus = 0;
#ifndef OPENSSL_NO_RC4
int pvk_encr = 2; int pvk_encr = 2;
#endif
apps_startup(); apps_startup();
@ -168,12 +170,14 @@ int MAIN(int argc, char **argv)
engine = *(++argv); engine = *(++argv);
} }
# endif # endif
#ifndef OPENSSL_NO_RC4
else if (strcmp(*argv, "-pvk-strong") == 0) else if (strcmp(*argv, "-pvk-strong") == 0)
pvk_encr = 2; pvk_encr = 2;
else if (strcmp(*argv, "-pvk-weak") == 0) else if (strcmp(*argv, "-pvk-weak") == 0)
pvk_encr = 1; pvk_encr = 1;
else if (strcmp(*argv, "-pvk-none") == 0) else if (strcmp(*argv, "-pvk-none") == 0)
pvk_encr = 0; pvk_encr = 0;
#endif
else if (strcmp(*argv, "-noout") == 0) else if (strcmp(*argv, "-noout") == 0)
noout = 1; noout = 1;
else if (strcmp(*argv, "-text") == 0) else if (strcmp(*argv, "-text") == 0)

5
apps/rsa.c
View File

@ -115,8 +115,9 @@ int MAIN(int argc, char **argv)
char *engine = NULL; char *engine = NULL;
# endif # endif
int modulus = 0; int modulus = 0;
#ifndef OPENSSL_NO_RC4
int pvk_encr = 2; int pvk_encr = 2;
#endif
apps_startup(); apps_startup();
@ -178,12 +179,14 @@ int MAIN(int argc, char **argv)
pubin = 2; pubin = 2;
else if (strcmp(*argv, "-RSAPublicKey_out") == 0) else if (strcmp(*argv, "-RSAPublicKey_out") == 0)
pubout = 2; pubout = 2;
#ifndef OPENSSL_NO_RC4
else if (strcmp(*argv, "-pvk-strong") == 0) else if (strcmp(*argv, "-pvk-strong") == 0)
pvk_encr = 2; pvk_encr = 2;
else if (strcmp(*argv, "-pvk-weak") == 0) else if (strcmp(*argv, "-pvk-weak") == 0)
pvk_encr = 1; pvk_encr = 1;
else if (strcmp(*argv, "-pvk-none") == 0) else if (strcmp(*argv, "-pvk-none") == 0)
pvk_encr = 0; pvk_encr = 0;
#endif
else if (strcmp(*argv, "-noout") == 0) else if (strcmp(*argv, "-noout") == 0)
noout = 1; noout = 1;
else if (strcmp(*argv, "-text") == 0) else if (strcmp(*argv, "-text") == 0)