make update

[openssl.git] / apps / rsa.c

diff --git a/apps/rsa.c b/apps/rsa.c
index 700df4223ed9e4beca2da03a55cb8030f5276b68..8ae67bbac556ea2816afea0d2b03e4c20894e2eb 100644 (file)
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -68,7 +68,6 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-#include <openssl/engine.h>
 
 #undef PROG
 #define PROG   rsa_main
@@ -194,7 +193,7 @@ bad:
                BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
                BIO_printf(bio_err," -des            encrypt PEM output with cbc des\n");
                BIO_printf(bio_err," -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
-#ifndef NO_IDEA
+#ifndef OPENSSL_NO_IDEA
                BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
 #endif
                BIO_printf(bio_err," -text           print the key in text\n");
@@ -209,23 +208,7 @@ bad:
 
        ERR_load_crypto_strings();
 
-       if (engine != NULL)
-               {
-               if((e = ENGINE_by_id(engine)) == NULL)
-                       {
-                       BIO_printf(bio_err,"invalid engine \"%s\"\n",
-                               engine);
-                       goto end;
-                       }
-               if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
-                       {
-                       BIO_printf(bio_err,"can't use that engine\n");
-                       goto end;
-                       }
-               BIO_printf(bio_err,"engine \"%s\" set.\n", engine);
-               /* Free our "structural" reference. */
-               ENGINE_free(e);
-               }
+        e = setup_engine(bio_err, engine, 0);
 
        if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
                BIO_printf(bio_err, "Error getting passwords\n");
@@ -261,11 +244,11 @@ bad:
                if (pubin) rsa=d2i_RSA_PUBKEY_bio(in,NULL);
                else rsa=d2i_RSAPrivateKey_bio(in,NULL);
        }
-#ifndef NO_RC4
+#ifndef OPENSSL_NO_RC4
        else if (informat == FORMAT_NETSCAPE)
                {
                BUF_MEM *buf=NULL;
-               unsigned char *p;
+               const unsigned char *p;
                int size=0;
 
                buf=BUF_MEM_new();
@@ -307,7 +290,7 @@ bad:
        if (outfile == NULL)
                {
                BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef VMS
+#ifdef OPENSSL_SYS_VMS
                {
                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                out = BIO_push(tmpbio, out);
@@ -375,7 +358,7 @@ bad:
                if(pubout || pubin) i=i2d_RSA_PUBKEY_bio(out,rsa);
                else i=i2d_RSAPrivateKey_bio(out,rsa);
        }
-#ifndef NO_RC4
+#ifndef OPENSSL_NO_RC4
        else if (outformat == FORMAT_NETSCAPE)
                {
                unsigned char *p,*pp;
@@ -416,9 +399,10 @@ end:
        if(rsa != NULL) RSA_free(rsa);
        if(passin) OPENSSL_free(passin);
        if(passout) OPENSSL_free(passout);
+       apps_shutdown();
        EXIT(ret);
        }
-#else /* !NO_RSA */
+#else /* !OPENSSL_NO_RSA */
 
 # if PEDANTIC
 static void *dummy=&dummy;