pkey: additional EC related options

[oweals/openssl.git] / apps / version.c

diff --git a/apps/version.c b/apps/version.c
index 7350ccf78f091a25386eab7d0d41a6b794508bac..83a726a814b0fadd7fae5e1b60e269f85cc34cd0 100644 (file)
--- a/apps/version.c
+++ b/apps/version.c
@@ -15,21 +15,6 @@
 #include <openssl/evp.h>
 #include <openssl/crypto.h>
 #include <openssl/bn.h>
-#ifndef OPENSSL_NO_MD2
-# include <openssl/md2.h>
-#endif
-#ifndef OPENSSL_NO_RC4
-# include <openssl/rc4.h>
-#endif
-#ifndef OPENSSL_NO_DES
-# include <openssl/des.h>
-#endif
-#ifndef OPENSSL_NO_IDEA
-# include <openssl/idea.h>
-#endif
-#ifndef OPENSSL_NO_BF
-# include <openssl/blowfish.h>
-#endif
 
 typedef enum OPTION_choice {
     OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
@@ -37,7 +22,10 @@ typedef enum OPTION_choice {
 } OPTION_CHOICE;
 
 const OPTIONS version_options[] = {
+    OPT_SECTION("General"),
     {"help", OPT_HELP, '-', "Display this summary"},
+
+    OPT_SECTION("Output"),
     {"a", OPT_A, '-', "Show all data"},
     {"b", OPT_B, '-', "Show build date"},
     {"d", OPT_D, '-', "Show configuration directory"},
@@ -126,21 +114,6 @@ opthelp:
     if (options) {
         printf("options: ");
         printf(" %s", BN_options());
-#ifndef OPENSSL_NO_MD2
-        printf(" %s", MD2_options());
-#endif
-#ifndef OPENSSL_NO_RC4
-        printf(" %s", RC4_options());
-#endif
-#ifndef OPENSSL_NO_DES
-        printf(" %s", DES_options());
-#endif
-#ifndef OPENSSL_NO_IDEA
-        printf(" %s", IDEA_options());
-#endif
-#ifndef OPENSSL_NO_BF
-        printf(" %s", BF_options());
-#endif
         printf("\n");
     }
     if (cflags)