Get rid of some unnecessary casts and add a necessary one.

[oweals/openssl.git] / apps / rsa.c

diff --git a/apps/rsa.c b/apps/rsa.c
index 056936da73490ad8334bc425ddf4e2ab4d467e6e..3be1f67657dd2162604b8231889ae6690c61de16 100644 (file)
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -56,17 +56,18 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_RSA
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "rsa.h"
-#include "evp.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG   rsa_main
@@ -82,14 +83,12 @@
  * -modulus    - print the RSA key modulus
  */
 
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
        {
        int ret=1;
        RSA *rsa=NULL;
        int i,badops=0;
-       EVP_CIPHER *enc=NULL;
+       const EVP_CIPHER *enc=NULL;
        BIO *in=NULL,*out=NULL;
        int informat,outformat,text=0,noout=0;
        char *infile,*outfile,*prog;
@@ -300,4 +299,4 @@ end:
        if (rsa != NULL) RSA_free(rsa);
        EXIT(ret);
        }
-
+#endif