generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR 2580: dgst missing current SHA algorithms

Browse Source 
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>
This commit is contained in:
Nick Lewis 2014-08-11 22:56:46 -04:00 committed by Rich Salz
parent 2a1393a4a8
commit 9aaa7be8d4
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/progs.h
View File

@ -172,6 +172,18 @@ FUNCTION functions[] = {
#ifndef OPENSSL_NO_RMD160 #ifndef OPENSSL_NO_RMD160
{FUNC_TYPE_MD,"rmd160",dgst_main}, {FUNC_TYPE_MD,"rmd160",dgst_main},
#endif #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 #ifndef OPENSSL_NO_AES
{FUNC_TYPE_CIPHER,"aes-128-cbc",enc_main}, {FUNC_TYPE_CIPHER,"aes-128-cbc",enc_main},
#endif #endif

2
apps/progs.pl
View File

@ -57,7 +57,7 @@ foreach (@ARGV)
{ print $str; } { print $str; }
} }
foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160") foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160","sha224","sha256","sha384","sha512")
{ {
push(@files,$_); push(@files,$_);
printf "#ifndef OPENSSL_NO_".uc($_)."\n\t{FUNC_TYPE_MD,\"".$_."\",dgst_main},\n#endif\n"; printf "#ifndef OPENSSL_NO_".uc($_)."\n\t{FUNC_TYPE_MD,\"".$_."\",dgst_main},\n#endif\n";

8
doc/apps/dgst.pod
View File

@ -2,12 +2,12 @@
=head1 NAME =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 =head1 SYNOPSIS
B<openssl> B<dgst> 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<-c>]
[B<-d>] [B<-d>]
[B<-hex>] [B<-hex>]
@ -22,7 +22,7 @@ B<openssl> B<dgst>
[B<-hmac key>] [B<-hmac key>]
[B<file...>] [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<-c>]
[B<-d>] [B<-d>]
[B<file...>] [B<file...>]
@ -147,7 +147,7 @@ used.
=head1 NOTES =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. however still widely used.
If you wish to sign or verify data using the DSA algorithm then the dss1 If you wish to sign or verify data using the DSA algorithm then the dss1