fast reduction for NIST curves

[openssl.git] / apps / smime.c

diff --git a/apps/smime.c b/apps/smime.c
index cd750e32b7cb9d157719f787fdad9e6f6dffc58e..ef0e4774644542ffca00bd19158697b7bd69db62 100644 (file)
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -109,6 +109,12 @@ 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;
 
@@ -133,11 +139,11 @@ int MAIN(int argc, char **argv)
                                cipher = EVP_rc2_64_cbc();
 #endif
 #ifndef OPENSSL_NO_AES
-               else if (!strcmp(*argv,"-aes128") == 0)
+               else if (!strcmp(*args,"-aes128"))
                                cipher = EVP_aes_128_cbc();
-               else if (!strcmp(*argv,"-aes192") == 0)
+               else if (!strcmp(*args,"-aes192"))
                                cipher = EVP_aes_192_cbc();
-               else if (!strcmp(*argv,"-aes256") == 0)
+               else if (!strcmp(*args,"-aes256"))
                                cipher = EVP_aes_256_cbc();
 #endif
                else if (!strcmp (*args, "-text")) 
@@ -422,7 +428,7 @@ int MAIN(int argc, char **argv)
        } else keyfile = NULL;
 
        if(keyfile) {
-               key = load_key(bio_err, keyfile, keyform, passin, e,
+               key = load_key(bio_err, keyfile, keyform, 0, passin, e,
                               "signing key file");
                if (!key) {
                        goto end;
@@ -465,7 +471,10 @@ int MAIN(int argc, char **argv)
                p7 = PKCS7_encrypt(encerts, in, cipher, flags);
        } else if(operation == SMIME_SIGN) {
                p7 = PKCS7_sign(signer, key, other, in, flags);
-               BIO_reset(in);
+               if (BIO_reset(in) != 0 && (flags & PKCS7_DETACHED)) {
+                 BIO_printf(bio_err, "Can't rewind input file\n");
+                 goto end;
+               }
        } else {
                if(informat == FORMAT_SMIME) 
                        p7 = SMIME_read_PKCS7(in, &indata);
@@ -505,9 +514,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);