Add forgotten "-passin" option to smime.c usage help.

[oweals/openssl.git] / apps / dgst.c

diff --git a/apps/dgst.c b/apps/dgst.c
index 8500f6c7e67501ba1f0c78b2adc8baca16f0987e..0e93c97ca507659450d1d3e89def60ebec675738 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -66,7 +66,6 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-#include <openssl/engine.h>
 
 #undef BUFSIZE
 #define BUFSIZE        1024*8
@@ -81,7 +80,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
-       ENGINE *e = NULL;
        unsigned char *buf=NULL;
        int i,err=0;
        const EVP_MD *md=NULL,*m;
@@ -93,14 +91,12 @@ int MAIN(int argc, char **argv)
        char pname[PROG_NAME_SIZE];
        int separator=0;
        int debug=0;
-       int keyform=FORMAT_PEM;
        const char *outfile = NULL, *keyfile = NULL;
        const char *sigfile = NULL, *randfile = NULL;
        char out_bin = -1, want_pub = 0, do_verify = 0;
        EVP_PKEY *sigkey = NULL;
        unsigned char *sigbuf = NULL;
        int siglen = 0;
-       char *engine=NULL;
 
        apps_startup();
 
@@ -158,16 +154,6 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) break;
                        sigfile=*(++argv);
                        }
-               else if (strcmp(*argv,"-keyform") == 0)
-                       {
-                       if (--argc < 1) break;
-                       keyform=str2fmt(*(++argv));
-                       }
-               else if (strcmp(*argv,"-engine") == 0)
-                       {
-                       if (--argc < 1) break;
-                       engine= *(++argv);
-                       }
                else if (strcmp(*argv,"-hex") == 0)
                        out_bin = 0;
                else if (strcmp(*argv,"-binary") == 0)
@@ -202,10 +188,8 @@ int MAIN(int argc, char **argv)
                BIO_printf(bio_err,"-sign   file    sign digest using private key in file\n");
                BIO_printf(bio_err,"-verify file    verify a signature using public key in file\n");
                BIO_printf(bio_err,"-prverify file  verify a signature using private key in file\n");
-               BIO_printf(bio_err,"-keyform arg    key file format (PEM or ENGINE)\n");
                BIO_printf(bio_err,"-signature file signature to verify\n");
                BIO_printf(bio_err,"-binary         output in binary form\n");
-               BIO_printf(bio_err,"-engine e       use engine e, possibly a hardware device.\n");
 
                BIO_printf(bio_err,"-%3s to use the %s message digest algorithm (default)\n",
                        LN_md5,LN_md5);
@@ -225,24 +209,6 @@ 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);
-               }
-
        in=BIO_new(BIO_s_file());
        bmd=BIO_new(BIO_f_md());
        if (debug)
@@ -287,47 +253,20 @@ int MAIN(int argc, char **argv)
                goto end;
        }
 
-       if(keyfile)
-               {
-               if (keyform == FORMAT_PEM)
-                       {
-                       BIO *keybio;
-                       keybio = BIO_new_file(keyfile, "r");
-                       if(!keybio)
-                               {
-                               BIO_printf(bio_err,
-                                       "Error opening key file %s\n",
-                                       keyfile);
-                               ERR_print_errors(bio_err);
-                               goto end;
-                               }
-                       if(want_pub) 
-                               sigkey = PEM_read_bio_PUBKEY(keybio,
-                                       NULL, NULL, NULL);
-                       else
-                               sigkey = PEM_read_bio_PrivateKey(keybio,
-                                       NULL, NULL, NULL);
-                       BIO_free(keybio);
-                       }
-               else if (keyform == FORMAT_ENGINE)
-                       {
-                       if (!e)
-                               {
-                               BIO_printf(bio_err,"no engine specified\n");
-                               goto end;
-                               }
-                       if (want_pub)
-                               sigkey = ENGINE_load_public_key(e, keyfile, NULL);
-                       else
-                               sigkey = ENGINE_load_private_key(e, keyfile, NULL);
-                       }
-               else
-                       {
-                       BIO_printf(bio_err,
-                               "bad input format specified for key file\n");
+       if(keyfile) {
+               BIO *keybio;
+               keybio = BIO_new_file(keyfile, "r");
+               if(!keybio) {
+                       BIO_printf(bio_err, "Error opening key file %s\n",
+                                                               keyfile);
+                       ERR_print_errors(bio_err);
                        goto end;
-                       }
+               }
                
+               if(want_pub) 
+                       sigkey = PEM_read_bio_PUBKEY(keybio, NULL, NULL, NULL);
+               else sigkey = PEM_read_bio_PrivateKey(keybio, NULL, NULL, NULL);
+               BIO_free(keybio);
                if(!sigkey) {
                        BIO_printf(bio_err, "Error reading key file %s\n",
                                                                keyfile);