From 9240b999ffcf6cc93f9971b9a65c1d53dc1bddd5 Mon Sep 17 00:00:00 2001 From: jsing Date: Fri, 19 Jun 2015 15:06:51 +0000 Subject: [PATCH] Add missing message digests to function table. Diff from kinichiro via github. ok doug@ --- usr.bin/openssl/progs.h | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/usr.bin/openssl/progs.h b/usr.bin/openssl/progs.h index e1494e1147f..cb411e6b4a5 100644 --- a/usr.bin/openssl/progs.h +++ b/usr.bin/openssl/progs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: progs.h,v 1.2 2015/02/10 15:29:34 jsing Exp $ */ +/* $OpenBSD: progs.h,v 1.3 2015/06/19 15:06:51 jsing Exp $ */ /* Public domain */ extern int asn1parse_main(int argc, char *argv[]); @@ -132,14 +132,23 @@ FUNCTION functions[] = { #endif /* Message Digests. */ +#ifndef OPENSSL_NO_GOST + { FUNC_TYPE_MD, "gost-mac", dgst_main }, + { FUNC_TYPE_MD, "md_gost94", dgst_main }, + { FUNC_TYPE_MD, "streebog256", dgst_main }, + { FUNC_TYPE_MD, "streebog512", dgst_main }, +#endif #ifndef OPENSSL_NO_MD4 { FUNC_TYPE_MD, "md4", dgst_main }, #endif #ifndef OPENSSL_NO_MD5 { FUNC_TYPE_MD, "md5", dgst_main }, #endif -#ifndef OPENSSL_NO_RMD160 - { FUNC_TYPE_MD, "rmd160", dgst_main }, +#ifndef OPENSSL_NO_MDC2 + { FUNC_TYPE_MD, "mdc2", dgst_main }, +#endif +#ifndef OPENSSL_NO_RIPEMD160 + { FUNC_TYPE_MD, "ripemd160", dgst_main }, #endif #ifndef OPENSSL_NO_SHA { FUNC_TYPE_MD, "sha", dgst_main }, @@ -147,6 +156,21 @@ FUNCTION functions[] = { #ifndef OPENSSL_NO_SHA1 { FUNC_TYPE_MD, "sha1", 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_WHIRLPOOL + { FUNC_TYPE_MD, "whirlpool", dgst_main }, +#endif /* Ciphers. */ { FUNC_TYPE_CIPHER, "base64", enc_main }, -- 2.20.1