PR 2580: dgst missing current SHA algorithms

Update the dgst.pod page to include SHA224...512 algorithms.
Update apps/progs.pl to add them to the digest command table.

Reviewed-by: Tim Hudson <tjh@cryptosoft.com>

diff --git a/apps/progs.h b/apps/progs.h
index d79b974ad159b5ddf1ab8ea62a8b229d9ecd6e2c..dd549e2b7f5a58523e16696e5f5c438dc0af6825 100644 (file)
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -172,6 +172,18 @@ FUNCTION functions[] = {
 #ifndef OPENSSL_NO_RMD160
        {FUNC_TYPE_MD,"rmd160",dgst_main},
 #endif
+#ifndef OPENSSL_NO_SHA224
+       {FUNC_TYPE_MD,"sha224",dgst_main},
+#endif
+#ifndef OPENSSL_NO_SHA256
+       {FUNC_TYPE_MD,"sha256",dgst_main},
+#endif
+#ifndef OPENSSL_NO_SHA384
+       {FUNC_TYPE_MD,"sha384",dgst_main},
+#endif
+#ifndef OPENSSL_NO_SHA512
+       {FUNC_TYPE_MD,"sha512",dgst_main},
+#endif
 #ifndef OPENSSL_NO_AES
        {FUNC_TYPE_CIPHER,"aes-128-cbc",enc_main},
 #endif

diff --git a/apps/progs.pl b/apps/progs.pl
index fa6258cf5e1324260f998da97bc6660427598635..2b1efd8fed33effc1a2dabf845208b6c45e96a94 100644 (file)
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -57,7 +57,7 @@ foreach (@ARGV)
                { print $str; }
        }
 
-foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160")
+foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160","sha224","sha256","sha384","sha512")
        {
        push(@files,$_);
        printf "#ifndef OPENSSL_NO_".uc($_)."\n\t{FUNC_TYPE_MD,\"".$_."\",dgst_main},\n#endif\n";

diff --git a/doc/apps/dgst.pod b/doc/apps/dgst.pod
index b035edf08e0fb2a3d7285333a9df749238910c0f..ebe0ffbebdc93693a6d752b4bdc4ec20fd0fc876 100644 (file)
--- a/doc/apps/dgst.pod
+++ b/doc/apps/dgst.pod
@@ -2,12 +2,12 @@
 
 =head1 NAME
 
-dgst, md5, md4, md2, sha1, sha, mdc2, ripemd160 - message digests
+dgst, md5, md4, md2, sha1, sha, mdc2, ripemd160, sha224, sha256, sha384, sha512 - message digests
 
 =head1 SYNOPSIS
 
 B<openssl> B<dgst> 
-[B<-md5|-md4|-md2|-sha1|-sha|-mdc2|-ripemd160|-dss1>]
+[B<-md5|-md4|-md2|-sha1|-sha|-mdc2|-ripemd160|-sha224|-sha256|-sha384|-sha512|-dss1>]
 [B<-c>]
 [B<-d>]
 [B<-hex>]
@@ -22,7 +22,7 @@ B<openssl> B<dgst>
 [B<-hmac key>]
 [B<file...>]
 
-[B<md5|md4|md2|sha1|sha|mdc2|ripemd160>]
+[B<md5|md4|md2|sha1|sha|mdc2|ripemd160|sha224|sha256|sha384|sha512>]
 [B<-c>]
 [B<-d>]
 [B<file...>]
@@ -147,7 +147,7 @@ used.
 
 =head1 NOTES
 
-The digest of choice for all new applications is SHA1. Other digests are
+The digest of choice for all new applications is SHA256. Other digests are
 however still widely used.
 
 If you wish to sign or verify data using the DSA algorithm then the dss1