summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2015-06-19 15:06:51 +0000
committerjsing <>2015-06-19 15:06:51 +0000
commit1884f88848338fd5650d7ac8131a2ceeeac6affb (patch)
tree4ce030cd9f87dc94702f77a83efcb66809f2a485 /src
parent1ddbaf1f551779f7d84774ceb64c99da63ea57ff (diff)
downloadopenbsd-1884f88848338fd5650d7ac8131a2ceeeac6affb.tar.gz
openbsd-1884f88848338fd5650d7ac8131a2ceeeac6affb.tar.bz2
openbsd-1884f88848338fd5650d7ac8131a2ceeeac6affb.zip
Add missing message digests to function table.
Diff from kinichiro via github. ok doug@
Diffstat (limited to 'src')
-rw-r--r--src/usr.bin/openssl/progs.h30
1 files changed, 27 insertions, 3 deletions
diff --git a/src/usr.bin/openssl/progs.h b/src/usr.bin/openssl/progs.h
index e1494e1147..cb411e6b4a 100644
--- a/src/usr.bin/openssl/progs.h
+++ b/src/usr.bin/openssl/progs.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: progs.h,v 1.2 2015/02/10 15:29:34 jsing Exp $ */ 1/* $OpenBSD: progs.h,v 1.3 2015/06/19 15:06:51 jsing Exp $ */
2/* Public domain */ 2/* Public domain */
3 3
4extern int asn1parse_main(int argc, char *argv[]); 4extern int asn1parse_main(int argc, char *argv[]);
@@ -132,14 +132,23 @@ FUNCTION functions[] = {
132#endif 132#endif
133 133
134 /* Message Digests. */ 134 /* Message Digests. */
135#ifndef OPENSSL_NO_GOST
136 { FUNC_TYPE_MD, "gost-mac", dgst_main },
137 { FUNC_TYPE_MD, "md_gost94", dgst_main },
138 { FUNC_TYPE_MD, "streebog256", dgst_main },
139 { FUNC_TYPE_MD, "streebog512", dgst_main },
140#endif
135#ifndef OPENSSL_NO_MD4 141#ifndef OPENSSL_NO_MD4
136 { FUNC_TYPE_MD, "md4", dgst_main }, 142 { FUNC_TYPE_MD, "md4", dgst_main },
137#endif 143#endif
138#ifndef OPENSSL_NO_MD5 144#ifndef OPENSSL_NO_MD5
139 { FUNC_TYPE_MD, "md5", dgst_main }, 145 { FUNC_TYPE_MD, "md5", dgst_main },
140#endif 146#endif
141#ifndef OPENSSL_NO_RMD160 147#ifndef OPENSSL_NO_MDC2
142 { FUNC_TYPE_MD, "rmd160", dgst_main }, 148 { FUNC_TYPE_MD, "mdc2", dgst_main },
149#endif
150#ifndef OPENSSL_NO_RIPEMD160
151 { FUNC_TYPE_MD, "ripemd160", dgst_main },
143#endif 152#endif
144#ifndef OPENSSL_NO_SHA 153#ifndef OPENSSL_NO_SHA
145 { FUNC_TYPE_MD, "sha", dgst_main }, 154 { FUNC_TYPE_MD, "sha", dgst_main },
@@ -147,6 +156,21 @@ FUNCTION functions[] = {
147#ifndef OPENSSL_NO_SHA1 156#ifndef OPENSSL_NO_SHA1
148 { FUNC_TYPE_MD, "sha1", dgst_main }, 157 { FUNC_TYPE_MD, "sha1", dgst_main },
149#endif 158#endif
159#ifndef OPENSSL_NO_SHA224
160 { FUNC_TYPE_MD, "sha224", dgst_main },
161#endif
162#ifndef OPENSSL_NO_SHA256
163 { FUNC_TYPE_MD, "sha256", dgst_main },
164#endif
165#ifndef OPENSSL_NO_SHA384
166 { FUNC_TYPE_MD, "sha384", dgst_main },
167#endif
168#ifndef OPENSSL_NO_SHA512
169 { FUNC_TYPE_MD, "sha512", dgst_main },
170#endif
171#ifndef OPENSSL_NO_WHIRLPOOL
172 { FUNC_TYPE_MD, "whirlpool", dgst_main },
173#endif
150 174
151 /* Ciphers. */ 175 /* Ciphers. */
152 { FUNC_TYPE_CIPHER, "base64", enc_main }, 176 { FUNC_TYPE_CIPHER, "base64", enc_main },