make update

[openssl.git] / apps / dsa.c

diff --git a/apps/dsa.c b/apps/dsa.c
index dedf8e174a04cc78b5cbf5ef1c814b9bd06a89b1..1ea0d7346d6fdaf9c67f6eb0e5a74574340f8b87 100644 (file)
--- 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)
@@ -352,12 +356,9 @@ int MAIN(int argc, char **argv)
     } else
         ret = 0;
  end:
-    if (in != NULL)
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free_all(out);
-    if (dsa != NULL)
-        DSA_free(dsa);
+    BIO_free(in);
+    BIO_free_all(out);
+    DSA_free(dsa);
     if (passin)
         OPENSSL_free(passin);
     if (passout)