Commit 35313768 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make OpenSSL compile with no-rc4 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 7a6c9792

apps/dsa.c

+4 −0
Original line number Diff line number Diff line
@@ -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)

apps/rsa.c

+4 −1
Original line number Diff line number Diff line
@@ -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)