Add apps_startup and bio_err init code to smime.c

[openssl.git] / apps / smime.c

diff --git a/apps/smime.c b/apps/smime.c
index 869933459b53a886b90e6fd1e18a92e5c4239678..b05bd704e88715a825c5e1fc1e5a2895f51183c5 100644 (file)
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -64,7 +64,6 @@
 #include <openssl/crypto.h>
 #include <openssl/pem.h>
 #include <openssl/err.h>
-#include <openssl/engine.h>
 
 #undef PROG
 #define PROG smime_main
@@ -110,6 +109,15 @@ int MAIN(int argc, char **argv)
        args = argv + 1;
        ret = 1;
 
+       apps_startup();
+
+       if (bio_err == NULL)
+               if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+                       BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
+
+       if (!load_config(bio_err, NULL))
+               goto end;
+
        while (!badarg && *args && *args[0] == '-') {
                if (!strcmp (*args, "-encrypt")) operation = SMIME_ENCRYPT;
                else if (!strcmp (*args, "-decrypt")) operation = SMIME_DECRYPT;
@@ -129,6 +137,14 @@ int MAIN(int argc, char **argv)
                                cipher = EVP_rc2_cbc();
                else if (!strcmp (*args, "-rc2-64")) 
                                cipher = EVP_rc2_64_cbc();
+#endif
+#ifndef OPENSSL_NO_AES
+               else if (!strcmp(*args,"-aes128"))
+                               cipher = EVP_aes_128_cbc();
+               else if (!strcmp(*args,"-aes192"))
+                               cipher = EVP_aes_192_cbc();
+               else if (!strcmp(*args,"-aes256"))
+                               cipher = EVP_aes_256_cbc();
 #endif
                else if (!strcmp (*args, "-text")) 
                                flags |= PKCS7_TEXT;
@@ -284,6 +300,10 @@ int MAIN(int argc, char **argv)
                BIO_printf (bio_err, "-rc2-40        encrypt with RC2-40 (default)\n");
                BIO_printf (bio_err, "-rc2-64        encrypt with RC2-64\n");
                BIO_printf (bio_err, "-rc2-128       encrypt with RC2-128\n");
+#endif
+#ifndef OPENSSL_NO_AES
+               BIO_printf (bio_err, "-aes128, -aes192, -aes256\n");
+               BIO_printf (bio_err, "               encrypt PEM output with cbc aes\n");
 #endif
                BIO_printf (bio_err, "-nointern      don't search certificates in message for signer\n");
                BIO_printf (bio_err, "-nosigs        don't verify message signature\n");
@@ -319,23 +339,7 @@ int MAIN(int argc, char **argv)
                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);
-               }
+        e = setup_engine(bio_err, engine, 0);
 
        if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
                BIO_printf(bio_err, "Error getting password\n");
@@ -507,9 +511,9 @@ int MAIN(int argc, char **argv)
        } else if(operation == SMIME_VERIFY) {
                STACK_OF(X509) *signers;
                if(PKCS7_verify(p7, other, store, indata, out, flags)) {
-                       BIO_printf(bio_err, "Verification Successful\n");
+                       BIO_printf(bio_err, "Verification successful\n");
                } else {
-                       BIO_printf(bio_err, "Verification Failure\n");
+                       BIO_printf(bio_err, "Verification failure\n");
                        goto end;
                }
                signers = PKCS7_get0_signers(p7, other, flags);