Update from HEAD

[openssl.git] / apps / dgst.c

diff --git a/apps/dgst.c b/apps/dgst.c
index e2fb728656fbc0ccd7bb34618aaf8267439eecf4..b14872748ac7df899bbd420d41a417444a88331c 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -269,9 +269,12 @@ int MAIN(int argc, char **argv)
                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,"-out filename   output to filename rather than stdout\n");
                BIO_printf(bio_err,"-signature file signature to verify\n");
                BIO_printf(bio_err,"-sigopt nm:v    signature parameter\n");
                BIO_printf(bio_err,"-hmac key       create hashed MAC with key\n");
+               BIO_printf(bio_err,"-mac algorithm  create MAC (not neccessarily HMAC)\n"); 
+               BIO_printf(bio_err,"-macopt nm:v    MAC algorithm parameters or key\n");
 #ifndef OPENSSL_NO_ENGINE
                BIO_printf(bio_err,"-engine e       use engine e, possibly a hardware device.\n");
 #endif
@@ -591,7 +594,7 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
        else
                {
                len=BIO_gets(bp,(char *)buf,BUFSIZE);
-               if (len <0) 
+               if ((int)len <0)
                        {
                        ERR_print_errors(bio_err);
                        return 1;