1 files changed, 2 insertions, 19 deletions

diff --git a/src/usr.bin/openssl/cms.c b/src/usr.bin/openssl/cms.c
index c6e662ab33..fccac23db7 100644
--- a/src/usr.bin/openssl/cms.c
+++ b/src/usr.bin/openssl/cms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms.c,v 1.2 2015/08/22 16:36:05 jsing Exp $ */
+/* $OpenBSD: cms.c,v 1.3 2015/09/11 14:30:23 bcook Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -99,7 +99,6 @@ int verify_err = 0;
 int
 cms_main(int argc, char **argv)
 {
-        ENGINE *e = NULL;
         int operation = 0;
         int ret = 0;
         char **args;
@@ -128,9 +127,6 @@ cms_main(int argc, char **argv)
         const EVP_MD *sign_md = NULL;
         int informat = FORMAT_SMIME, outformat = FORMAT_SMIME;
         int rctformat = FORMAT_SMIME, keyform = FORMAT_PEM;
-#ifndef OPENSSL_NO_ENGINE
-        char *engine = NULL;
-#endif
         unsigned char *secret_key = NULL, *secret_keyid = NULL;
         unsigned char *pwri_pass = NULL, *pwri_tmp = NULL;
         size_t secret_keylen = 0, secret_keyidlen = 0;
@@ -310,13 +306,6 @@ cms_main(int argc, char **argv)
                                 goto argerr;
                         }
                 }
-#ifndef OPENSSL_NO_ENGINE
-                else if (!strcmp(*args, "-engine")) {
-                        if (!args[1])
-                                goto argerr;
-                        engine = *++args;
-                }
-#endif
                 else if (!strcmp(*args, "-passin")) {
                         if (!args[1])
                                 goto argerr;
@@ -526,7 +515,7 @@ argerr:
                 BIO_printf(bio_err, "-in file       input file\n");
                 BIO_printf(bio_err, "-inform arg    input format SMIME (default), PEM or DER\n");
                 BIO_printf(bio_err, "-inkey file    input private key (if not signer or recipient)\n");
-                BIO_printf(bio_err, "-keyform arg   input private key format (PEM or ENGINE)\n");
+                BIO_printf(bio_err, "-keyform arg   input private key format (PEM)\n");
                 BIO_printf(bio_err, "-out file      output file\n");
                 BIO_printf(bio_err, "-outform arg   output format SMIME (default), PEM or DER\n");
                 BIO_printf(bio_err, "-content file  supply or override content for detached signature\n");
@@ -538,16 +527,10 @@ argerr:
                 BIO_printf(bio_err, "-CAfile file   trusted certificates file\n");
                 BIO_printf(bio_err, "-crl_check     check revocation status of signer's certificate using CRLs\n");
                 BIO_printf(bio_err, "-crl_check_all check revocation status of signer's certificate chain using CRLs\n");
-#ifndef OPENSSL_NO_ENGINE
-                BIO_printf(bio_err, "-engine e      use engine e, possibly a hardware device.\n");
-#endif
                 BIO_printf(bio_err, "-passin arg    input file pass phrase source\n");
                 BIO_printf(bio_err, "cert.pem       recipient certificate(s) for encryption\n");
                 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");