Stop spurious "unable to load config info" errors in req

[openssl.git] / apps / dgst.c

diff --git a/apps/dgst.c b/apps/dgst.c
index 0e93c97ca507659450d1d3e89def60ebec675738..7989a1dcd38604c16864f5c1d420a5c1b733c6ea 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -73,13 +73,14 @@
 #undef PROG
 #define PROG   dgst_main
 
 #undef PROG
 #define PROG   dgst_main
 

-void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, char binout,
+void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,

                EVP_PKEY *key, unsigned char *sigin, int siglen);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
                EVP_PKEY *key, unsigned char *sigin, int siglen);
 
 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;
        unsigned char *buf=NULL;
        int i,err=0;
        const EVP_MD *md=NULL,*m;


@@ -91,12 +92,14 @@ int MAIN(int argc, char **argv)
        char pname[PROG_NAME_SIZE];
        int separator=0;
        int debug=0;
        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;
        const char *outfile = NULL, *keyfile = NULL;
        const char *sigfile = NULL, *randfile = NULL;

-       char out_bin = -1, want_pub = 0, do_verify = 0;
+       int out_bin = -1, want_pub = 0, do_verify = 0;

        EVP_PKEY *sigkey = NULL;
        unsigned char *sigbuf = NULL;
        int siglen = 0;
        EVP_PKEY *sigkey = NULL;
        unsigned char *sigbuf = NULL;
        int siglen = 0;

+       char *engine=NULL;

 
        apps_startup();
 
 
        apps_startup();
 


@@ -154,6 +157,16 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) break;
                        sigfile=*(++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)
                else if (strcmp(*argv,"-hex") == 0)
                        out_bin = 0;
                else if (strcmp(*argv,"-binary") == 0)


@@ -188,8 +201,10 @@ 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,"-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,"-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);
 
                BIO_printf(bio_err,"-%3s to use the %s message digest algorithm (default)\n",
                        LN_md5,LN_md5);


@@ -209,6 +224,8 @@ int MAIN(int argc, char **argv)
                goto end;
                }
 
                goto end;
                }
 

+        e = setup_engine(bio_err, engine, 0);
+

        in=BIO_new(BIO_s_file());
        bmd=BIO_new(BIO_f_md());
        if (debug)
        in=BIO_new(BIO_s_file());
        bmd=BIO_new(BIO_f_md());
        if (debug)


@@ -238,7 +255,7 @@ int MAIN(int argc, char **argv)
                else    out = BIO_new_file(outfile, "w");
        } else {
                out = BIO_new_fp(stdout, BIO_NOCLOSE);
                else    out = BIO_new_file(outfile, "w");
        } else {
                out = BIO_new_fp(stdout, BIO_NOCLOSE);

-#ifdef VMS
+#ifdef OPENSSL_SYS_VMS

                {
                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                out = BIO_push(tmpbio, out);
                {
                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                out = BIO_push(tmpbio, out);


@@ -253,27 +270,21 @@ int MAIN(int argc, char **argv)
                goto end;
        }
 
                goto end;
        }
 

-       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);
-                       ERR_print_errors(bio_err);
+       if(keyfile)
+               {
+               if (want_pub)
+                       sigkey = load_pubkey(bio_err, keyfile, keyform, NULL,
+                               e, "key file");
+               else
+                       sigkey = load_key(bio_err, keyfile, keyform, NULL,
+                               e, "key file");
+               if (!sigkey)
+                       {
+                       /* load_[pub]key() has already printed an appropriate
+                          message */

                        goto end;
                        goto end;

+                       }

                }
                }

-       }

 
        if(sigfile && sigkey) {
                BIO *sigbio;
 
        if(sigfile && sigkey) {
                BIO *sigbio;


@@ -335,10 +346,11 @@ end:
        EVP_PKEY_free(sigkey);
        if(sigbuf) OPENSSL_free(sigbuf);
        if (bmd != NULL) BIO_free(bmd);
        EVP_PKEY_free(sigkey);
        if(sigbuf) OPENSSL_free(sigbuf);
        if (bmd != NULL) BIO_free(bmd);

+       apps_shutdown();

        EXIT(err);
        }
 
        EXIT(err);
        }
 

-void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, char binout,
+void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,

                        EVP_PKEY *key, unsigned char *sigin, int siglen)
        {
        int len;
                        EVP_PKEY *key, unsigned char *sigin, int siglen)
        {
        int len;