From c88f8f76b54d9d27f3c29645616d9ec427ee41c4 Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Sun, 25 Jul 2004 18:57:35 +0000
Subject: [PATCH] 'apps/openssl dgst -help' update and minor apps/speed.c
update.
---
apps/dgst.c | 10 ++++++++++
apps/speed.c | 5 +++++
2 files changed, 15 insertions(+)
diff --git a/apps/dgst.c b/apps/dgst.c
index be25dafef..c1bacd79b 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -222,10 +222,20 @@ int MAIN(int argc, char **argv)
LN_md4,LN_md4);
BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
LN_md2,LN_md2);
+#ifndef OPENSSL_NO_SHA
BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
LN_sha1,LN_sha1);
BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
LN_sha,LN_sha);
+#ifndef OPENSSL_NO_SHA256
+ BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
+ LN_sha256,LN_sha256);
+#endif
+#ifndef OPENSSL_NO_SHA512
+ BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
+ LN_sha512,LN_sha512);
+#endif
+#endif
BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
LN_mdc2,LN_mdc2);
BIO_printf(bio_err,"-%3s to use the %s message digest algorithm\n",
diff --git a/apps/speed.c b/apps/speed.c
index a3b0833b6..5697d3aef 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1576,6 +1576,7 @@ int MAIN(int argc, char **argv)
}
}
+#ifndef OPENSSL_NO_SHA256
if (doit[D_SHA256])
{
for (j=0; j<SIZE_NUM; j++)
@@ -1588,7 +1589,9 @@ int MAIN(int argc, char **argv)
print_result(D_SHA256,j,count,d);
}
}
+#endif
+#ifndef OPENSSL_NO_SHA512
if (doit[D_SHA512])
{
for (j=0; j<SIZE_NUM; j++)
@@ -1602,6 +1605,8 @@ int MAIN(int argc, char **argv)
}
}
#endif
+
+#endif
#ifndef OPENSSL_NO_RIPEMD
if (doit[D_RMD160])
{