'apps/openssl dgst -help' update and minor apps/speed.c update.

diff --git a/apps/dgst.c b/apps/dgst.c
index be25dafef7047a5e445e37154bd9afd753961f1a..c1bacd79b7a125bf172be6289209551acbfe10f7 100644 (file)
--- 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);
                        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);
                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",
                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 a3b0833b69006071d0b6ef87007400f80a266c43..5697d3aef47a9c45c172b8b820d2be5c5b7daf0c 100644 (file)
--- 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++)
        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);
                        }
                }
                        print_result(D_SHA256,j,count,d);
                        }
                }

+#endif

 
 

+#ifndef OPENSSL_NO_SHA512

        if (doit[D_SHA512])
                {
                for (j=0; j<SIZE_NUM; j++)
        if (doit[D_SHA512])
                {
                for (j=0; j<SIZE_NUM; j++)


@@ -1602,6 +1605,8 @@ int MAIN(int argc, char **argv)
                        }
                }
 #endif
                        }
                }
 #endif

+
+#endif

 #ifndef OPENSSL_NO_RIPEMD
        if (doit[D_RMD160])
                {
 #ifndef OPENSSL_NO_RIPEMD
        if (doit[D_RMD160])
                {