Add Rijndael as things to look through.

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

diff --git a/apps/dgst.c b/apps/dgst.c
index ab3e2dbb02486e6afedd00ffd8e92c2499e70998..4f1660c2a61c542f129de4a91542443d819bf47a 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -74,7 +74,7 @@
 #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 **);
@@ -93,9 +93,10 @@ 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;
+       int out_bin = -1, want_pub = 0, do_verify = 0;
        EVP_PKEY *sigkey = NULL;
        unsigned char *sigbuf = NULL;
        int siglen = 0;
@@ -157,6 +158,11 @@ 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;
@@ -196,6 +202,7 @@ 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");
@@ -280,20 +287,47 @@ int MAIN(int argc, char **argv)
                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);
+       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");
                        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);
@@ -365,7 +399,7 @@ end:
        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;