Fix declaration inconsistency in ecparam.c.

[openssl.git] / apps / rsautl.c

diff --git a/apps/rsautl.c b/apps/rsautl.c
index 36957e5b8420334a355222d94e41d0995abda285..5db6fe7cd74ff9982fd5132554085c01dbf046dd 100644 (file)
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -85,7 +85,9 @@ int MAIN(int argc, char **argv)
        ENGINE *e = NULL;
        BIO *in = NULL, *out = NULL;
        char *infile = NULL, *outfile = NULL;
+#ifndef OPENSSL_NO_ENGINE
        char *engine = NULL;
+#endif
        char *keyfile = NULL;
        char rsa_mode = RSA_VERIFY, key_type = KEY_PRIVKEY;
        int keyform = FORMAT_PEM;
@@ -95,6 +97,7 @@ int MAIN(int argc, char **argv)
        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;
 
@@ -122,12 +125,17 @@ int MAIN(int argc, char **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);
+#endif
                } else if(!strcmp(*argv, "-pubin")) {
                        key_type = KEY_PUBKEY;
                } else if(!strcmp(*argv, "-certin")) {
@@ -162,7 +170,13 @@ int MAIN(int argc, char **argv)
                goto end;
        }
 
+#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);
@@ -170,7 +184,7 @@ int MAIN(int argc, char **argv)
        switch(key_type) {
                case KEY_PRIVKEY:
                pkey = load_key(bio_err, keyfile, keyform, 0,
-                       NULL, e, "Private Key");
+                       passin, e, "Private Key");
                break;
 
                case KEY_PUBKEY:
@@ -284,6 +298,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);
+       if(passin) OPENSSL_free(passin);
        return ret;
 }
 
@@ -305,7 +320,10 @@ 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");
+#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
 
 }