honour '-no_tmp_rsa'

[openssl.git] / apps / version.c

diff --git a/apps/version.c b/apps/version.c
index 8d154ea8b3084704359f5701b935b5fb9d4ad534..efa0d0d493b7a41c67c5e2cab30bbbd01e16f788 100644 (file)
--- a/apps/version.c
+++ b/apps/version.c
@@ -60,18 +60,18 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "evp.h"
-#include "crypto.h"
+#include <openssl/evp.h>
+#include <openssl/crypto.h>
 
 #undef PROG
 #define PROG   version_main
 
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int, char **);
+
+int MAIN(int argc, char **argv)
        {
        int i,ret=0;
-       int cflags=0,version=0,date=0,options=0,platform=0;
+       int cflags=0,version=0,date=0,options=0,platform=0,dir=0;
 
        apps_startup();
 
@@ -92,8 +92,10 @@ char **argv;
                        options=1;
                else if (strcmp(argv[i],"-p") == 0)
                        platform=1;
+               else if (strcmp(argv[i],"-d") == 0)
+                       dir=1;
                else if (strcmp(argv[i],"-a") == 0)
-                       date=version=cflags=options=platform=1;
+                       date=version=cflags=options=platform=dir=1;
                else
                        {
                        BIO_printf(bio_err,"usage:version -[avbofp]\n");
@@ -107,26 +109,27 @@ char **argv;
        if (platform) printf("%s\n",SSLeay_version(SSLEAY_PLATFORM));
        if (options) 
                {
-               printf("options:");
+               printf("options:  ");
                printf("%s ",BN_options());
-#ifndef NO_MD2
+#ifndef OPENSSL_NO_MD2
                printf("%s ",MD2_options());
 #endif
-#ifndef NO_RC4
+#ifndef OPENSSL_NO_RC4
                printf("%s ",RC4_options());
 #endif
-#ifndef NO_DES
+#ifndef OPENSSL_NO_DES
                printf("%s ",des_options());
 #endif
-#ifndef NO_IDEA
+#ifndef OPENSSL_NO_IDEA
                printf("%s ",idea_options());
 #endif
-#ifndef NO_BLOWFISH
+#ifndef OPENSSL_NO_BF
                printf("%s ",BF_options());
 #endif
                printf("\n");
                }
        if (cflags)  printf("%s\n",SSLeay_version(SSLEAY_CFLAGS));
+       if (dir)  printf("%s\n",SSLeay_version(SSLEAY_DIR));
 end:
        EXIT(ret);
        }