Remove some OPENSSL_NO_SHA that snuck in

[openssl.git] / apps / progs.h

diff --git a/apps/progs.h b/apps/progs.h
index 959c7a84468a2f5a8403f0165b13ab5c90205dd6..9cc2f2b088ef45e1306e52f8229abef4011c8625 100644 (file)
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -1,12 +1,13 @@
 /*
- * Automatically generated by progs.pl for openssl.c
- * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * WARNING: do not edit!
+ * Generated by apps/progs.pl
  *
- * Licensed under the OpenSSL licenses, (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
- * or in the file LICENSE in the source distribution.
  */
 
 typedef enum FUNC_TYPE {
@@ -181,9 +182,7 @@ static FUNCTION functions[] = {
     { FT_general, "rand", rand_main, rand_options },
     { FT_general, "rehash", rehash_main, rehash_options },
     { FT_general, "req", req_main, req_options },
-#ifndef OPENSSL_NO_RSA
     { FT_general, "rsa", rsa_main, rsa_options },
-#endif
 #ifndef OPENSSL_NO_RSA
     { FT_general, "rsautl", rsautl_main, rsautl_options },
 #endif
@@ -221,21 +220,11 @@ static FUNCTION functions[] = {
 #ifndef OPENSSL_NO_GOST
     { FT_md, "gost", dgst_main},
 #endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha1", dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha224", dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha256", dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha384", dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA
     { FT_md, "sha512", dgst_main},
-#endif
 #ifndef OPENSSL_NO_MDC2
     { FT_md, "mdc2", dgst_main},
 #endif