const fixes

[openssl.git] / apps / rsautl.c

diff --git a/apps/rsautl.c b/apps/rsautl.c
index ba31979618760acdde4232b7bad44cf865146bdb..596199010a39ba7e7b196803904ae497a89363e9 100644 (file)
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -62,7 +62,7 @@
 #include <string.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <string.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>
+#include <openssl/rsa.h>

 
 #define RSA_SIGN       1
 #define RSA_VERIFY     2
 
 #define RSA_SIGN       1
 #define RSA_VERIFY     2


@@ -86,7 +86,9 @@ int MAIN(int argc, char **argv)
        ENGINE *e = NULL;
        BIO *in = NULL, *out = NULL;
        char *infile = NULL, *outfile = NULL;
        ENGINE *e = NULL;
        BIO *in = NULL, *out = NULL;
        char *infile = NULL, *outfile = NULL;

+#ifndef OPENSSL_NO_ENGINE

        char *engine = NULL;
        char *engine = NULL;

+#endif

        char *keyfile = NULL;
        char rsa_mode = RSA_VERIFY, key_type = KEY_PRIVKEY;
        int keyform = FORMAT_PEM;
        char *keyfile = NULL;
        char rsa_mode = RSA_VERIFY, key_type = KEY_PRIVKEY;
        int keyform = FORMAT_PEM;


@@ -96,6 +98,7 @@ int MAIN(int argc, char **argv)
        EVP_PKEY *pkey = NULL;
        RSA *rsa = NULL;
        unsigned char *rsa_in = NULL, *rsa_out = NULL, pad;
        EVP_PKEY *pkey = NULL;
        RSA *rsa = NULL;
        unsigned char *rsa_in = NULL, *rsa_out = NULL, pad;

+       char *passargin = NULL, *passin = NULL;

        int rsa_inlen, rsa_outlen = 0;
        int keysize;
 
        int rsa_inlen, rsa_outlen = 0;
        int keysize;
 


@@ -105,6 +108,9 @@ int MAIN(int argc, char **argv)
        argv++;
 
        if(!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
        argv++;
 
        if(!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);

+
+       if (!load_config(bio_err, NULL))
+               goto end;

        ERR_load_crypto_strings();
        OpenSSL_add_all_algorithms();
        pad = RSA_PKCS1_PADDING;
        ERR_load_crypto_strings();
        OpenSSL_add_all_algorithms();
        pad = RSA_PKCS1_PADDING;


@@ -120,9 +126,17 @@ int MAIN(int argc, char **argv)
                } else if(!strcmp(*argv, "-inkey")) {
                        if (--argc < 1) badarg = 1;
                        keyfile = *(++argv);
                } else if(!strcmp(*argv, "-inkey")) {
                        if (--argc < 1) badarg = 1;
                        keyfile = *(++argv);

+               } else if (!strcmp(*argv,"-passin")) {
+                       if (--argc < 1) badarg = 1;
+                       passargin= *(++argv);
+               } else if (strcmp(*argv,"-keyform") == 0) {
+                       if (--argc < 1) badarg = 1;
+                       keyform=str2fmt(*(++argv));
+#ifndef OPENSSL_NO_ENGINE

                } else if(!strcmp(*argv, "-engine")) {
                        if (--argc < 1) badarg = 1;
                        engine = *(++argv);
                } else if(!strcmp(*argv, "-engine")) {
                        if (--argc < 1) badarg = 1;
                        engine = *(++argv);

+#endif

                } else if(!strcmp(*argv, "-pubin")) {
                        key_type = KEY_PUBKEY;
                } else if(!strcmp(*argv, "-certin")) {
                } else if(!strcmp(*argv, "-pubin")) {
                        key_type = KEY_PUBKEY;
                } else if(!strcmp(*argv, "-certin")) {


@@ -157,38 +171,31 @@ int MAIN(int argc, char **argv)
                goto end;
        }
 
                goto end;
        }
 

-       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);
-               }
+#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
+#endif
+       if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
+               BIO_printf(bio_err, "Error getting password\n");
+               goto end;
+       }

 
 /* FIXME: seed PRNG only if needed */
        app_RAND_load_file(NULL, bio_err, 0);
        
        switch(key_type) {
                case KEY_PRIVKEY:
 
 /* FIXME: seed PRNG only if needed */
        app_RAND_load_file(NULL, bio_err, 0);
        
        switch(key_type) {
                case KEY_PRIVKEY:

-               pkey = load_key(bio_err, keyfile, keyform, NULL, e);
+               pkey = load_key(bio_err, keyfile, keyform, 0,
+                       passin, e, "Private Key");

                break;
 
                case KEY_PUBKEY:
                break;
 
                case KEY_PUBKEY:

-               pkey = load_pubkey(bio_err, keyfile, keyform, e);
+               pkey = load_pubkey(bio_err, keyfile, keyform, 0,
+                       NULL, e, "Public Key");

                break;
 
                case KEY_CERT:
                break;
 
                case KEY_CERT:

-               x = load_cert(bio_err, keyfile, keyform);
+               x = load_cert(bio_err, keyfile, keyform,
+                       NULL, e, "Certificate");

                if(x) {
                        pkey = X509_get_pubkey(x);
                        X509_free(x);
                if(x) {
                        pkey = X509_get_pubkey(x);
                        X509_free(x);


@@ -197,7 +204,6 @@ int MAIN(int argc, char **argv)
        }
 
        if(!pkey) {
        }
 
        if(!pkey) {

-               BIO_printf(bio_err, "Error loading key\n");

                return 1;
        }
 
                return 1;
        }
 


@@ -227,7 +233,7 @@ int MAIN(int argc, char **argv)
                }
        } else {
                out = BIO_new_fp(stdout, BIO_NOCLOSE);
                }
        } else {
                out = BIO_new_fp(stdout, BIO_NOCLOSE);

-#ifdef VMS
+#ifdef OPENSSL_SYS_VMS

                {
                    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                    out = BIO_push(tmpbio, out);
                {
                    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                    out = BIO_push(tmpbio, out);


@@ -293,6 +299,7 @@ int MAIN(int argc, char **argv)
        BIO_free_all(out);
        if(rsa_in) OPENSSL_free(rsa_in);
        if(rsa_out) OPENSSL_free(rsa_out);
        BIO_free_all(out);
        if(rsa_in) OPENSSL_free(rsa_in);
        if(rsa_out) OPENSSL_free(rsa_out);

+       if(passin) OPENSSL_free(passin);

        return ret;
 }
 
        return ret;
 }
 


@@ -302,6 +309,7 @@ static void usage()
        BIO_printf(bio_err, "-in file        input file\n");
        BIO_printf(bio_err, "-out file       output file\n");
        BIO_printf(bio_err, "-inkey file     input key\n");
        BIO_printf(bio_err, "-in file        input file\n");
        BIO_printf(bio_err, "-out file       output file\n");
        BIO_printf(bio_err, "-inkey file     input key\n");

+       BIO_printf(bio_err, "-keyform arg    private key format - default PEM\n");

        BIO_printf(bio_err, "-pubin          input is an RSA public\n");
        BIO_printf(bio_err, "-certin         input is a certificate carrying an RSA public key\n");
        BIO_printf(bio_err, "-ssl            use SSL v2 padding\n");
        BIO_printf(bio_err, "-pubin          input is an RSA public\n");
        BIO_printf(bio_err, "-certin         input is a certificate carrying an RSA public key\n");
        BIO_printf(bio_err, "-ssl            use SSL v2 padding\n");


@@ -313,6 +321,11 @@ static void usage()
        BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
        BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
        BIO_printf(bio_err, "-hexdump        hex dump output\n");
        BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
        BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
        BIO_printf(bio_err, "-hexdump        hex dump output\n");

+#ifndef OPENSSL_NO_ENGINE
+       BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+       BIO_printf (bio_err, "-passin arg    pass phrase source\n");
+#endif
+

 }
 
 #endif
 }
 
 #endif