disable Sun divison algorithm by default

[openssl.git] / apps / dgst.c

diff --git a/apps/dgst.c b/apps/dgst.c
index 7989a1dcd38604c16864f5c1d420a5c1b733c6ea..32e40c1f5368406796b6578bb38b1f4087b3d1e0 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -73,8 +73,9 @@
 #undef PROG
 #define PROG   dgst_main
 
-void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
-               EVP_PKEY *key, unsigned char *sigin, int siglen);
+int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
+         EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
+         const char *file);
 
 int MAIN(int, char **);
 
@@ -88,8 +89,8 @@ int MAIN(int argc, char **argv)
        BIO *bmd=NULL;
        BIO *out = NULL;
        const char *name;
-#define PROG_NAME_SIZE  16
-       char pname[PROG_NAME_SIZE];
+#define PROG_NAME_SIZE  39
+       char pname[PROG_NAME_SIZE+1];
        int separator=0;
        int debug=0;
        int keyform=FORMAT_PEM;
@@ -112,6 +113,9 @@ int MAIN(int argc, char **argv)
                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;
+
        /* first check the program name */
        program_name(argv[0],pname,PROG_NAME_SIZE);
 
@@ -273,10 +277,10 @@ int MAIN(int argc, char **argv)
        if(keyfile)
                {
                if (want_pub)
-                       sigkey = load_pubkey(bio_err, keyfile, keyform, NULL,
+                       sigkey = load_pubkey(bio_err, keyfile, keyform, 0, NULL,
                                e, "key file");
                else
-                       sigkey = load_key(bio_err, keyfile, keyform, NULL,
+                       sigkey = load_key(bio_err, keyfile, keyform, 0, NULL,
                                e, "key file");
                if (!sigkey)
                        {
@@ -316,22 +320,36 @@ int MAIN(int argc, char **argv)
        if (argc == 0)
                {
                BIO_set_fp(in,stdin,BIO_NOCLOSE);
-               do_fp(out, buf,inp,separator, out_bin, sigkey, sigbuf, siglen);
+               err=do_fp(out, buf,inp,separator, out_bin, sigkey, sigbuf,
+                         siglen,"","(stdin)");
                }
        else
                {
                name=OBJ_nid2sn(md->type);
                for (i=0; i<argc; i++)
                        {
+                       char *tmp,*tofree=NULL;
+                       int r;
+
                        if (BIO_read_filename(in,argv[i]) <= 0)
                                {
                                perror(argv[i]);
                                err++;
                                continue;
                                }
-                       if(!out_bin) BIO_printf(out, "%s(%s)= ",name,argv[i]);
-                       do_fp(out, buf,inp,separator, out_bin, sigkey, 
-                                                               sigbuf, siglen);
+                       if(!out_bin)
+                               {
+                               tmp=tofree=OPENSSL_malloc(strlen(name)+strlen(argv[i])+5);
+                               sprintf(tmp,"%s(%s)= ",name,argv[i]);
+                               }
+                       else
+                               tmp="";
+                       r=do_fp(out,buf,inp,separator,out_bin,sigkey,sigbuf,
+                               siglen,tmp,argv[i]);
+                       if(r)
+                           err=r;
+                       if(tofree)
+                               OPENSSL_free(tofree);
                        (void)BIO_reset(bmd);
                        }
                }
@@ -350,8 +368,9 @@ end:
        EXIT(err);
        }
 
-void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
-                       EVP_PKEY *key, unsigned char *sigin, int siglen)
+int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
+         EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
+         const char *file)
        {
        int len;
        int i;
@@ -359,21 +378,33 @@ void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
        for (;;)
                {
                i=BIO_read(bp,(char *)buf,BUFSIZE);
-               if (i <= 0) break;
+               if(i < 0)
+                       {
+                       BIO_printf(bio_err, "Read Error in %s\n",file);
+                       ERR_print_errors(bio_err);
+                       return 1;
+                       }
+               if (i == 0) break;
                }
        if(sigin)
                {
                EVP_MD_CTX *ctx;
                BIO_get_md_ctx(bp, &ctx);
                i = EVP_VerifyFinal(ctx, sigin, (unsigned int)siglen, key); 
-               if(i > 0) BIO_printf(out, "Verified OK\n");
-               else if(i == 0) BIO_printf(out, "Verification Failure\n");
+               if(i > 0)
+                       BIO_printf(out, "Verified OK\n");
+               else if(i == 0)
+                       {
+                       BIO_printf(out, "Verification Failure\n");
+                       return 1;
+                       }
                else
                        {
                        BIO_printf(bio_err, "Error Verifying Data\n");
                        ERR_print_errors(bio_err);
+                       return 1;
                        }
-               return;
+               return 0;
                }
        if(key)
                {
@@ -383,7 +414,7 @@ void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
                        {
                        BIO_printf(bio_err, "Error Signing Data\n");
                        ERR_print_errors(bio_err);
-                       return;
+                       return 1;
                        }
                }
        else
@@ -392,6 +423,7 @@ void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
        if(binout) BIO_write(out, buf, len);
        else 
                {
+               BIO_write(out,title,strlen(title));
                for (i=0; i<len; i++)
                        {
                        if (sep && (i != 0))
@@ -400,5 +432,6 @@ void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
                        }
                BIO_printf(out, "\n");
                }
+       return 0;
        }