提交 35313768 编写于 作者: D Dr. Stephen Henson

Make OpenSSL compile with no-rc4

Reviewed-by: NMatt Caswell <matt@openssl.org>
上级 7a6c9792
...@@ -113,7 +113,9 @@ int MAIN(int argc, char **argv) ...@@ -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) ...@@ -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)
......
...@@ -115,8 +115,9 @@ int MAIN(int argc, char **argv) ...@@ -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) ...@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册