Add SSLEAY_DIR argument code for SSLeay_version.

Add '-d' option for 'openssl version' (included in '-a').

diff --git a/CHANGES b/CHANGES
index abddaa43fd8d5729d31b8bea082626560e7017d4..5102203a88651eaef5b4514b1d989da14ab8c3f5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,11 @@
 
  Changes between 0.9.6 and 0.9.7  [xx XXX 2000]
 
+  *) New SSLeay_version code SSLEAY_DIR to determine the compiled-in
+     value of OPENSSLDIR.  This is available via the new '-d' option
+     to 'openssl version', and is also included in 'openssl version -a'.
+     [Bodo Moeller]
+
   *) Fix C code generated by 'openssl dsaparam -C': If a BN_bin2bn
      call failed, free the DSA structure.
      [Bodo Moeller]

diff --git a/apps/version.c b/apps/version.c
index f5c9adc25471c17e8f05ae54822c28ad15fb70e4..c29343b4fa7f5d8706ba9341e53f0448011f8347 100644 (file)
--- a/apps/version.c
+++ b/apps/version.c
@@ -71,7 +71,7 @@ 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 @@ int MAIN(int argc, 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");
@@ -127,6 +129,7 @@ int MAIN(int argc, char **argv)
                printf("\n");
                }
        if (cflags)  printf("%s\n",SSLeay_version(SSLEAY_CFLAGS));
+       if (dir)  printf("%s\n",SSLeay_version(SSLEAY_DIR));
 end:
        EXIT(ret);
        }

diff --git a/crypto/crypto.h b/crypto/crypto.h
index d5a397a63daffa10a849d736ef887deba1ada761..45309496a7e4255b1cf14eabbc94e39ab817735e 100644 (file)
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -90,6 +90,7 @@ extern "C" {
 #define SSLEAY_CFLAGS          2
 #define SSLEAY_BUILT_ON                3
 #define SSLEAY_PLATFORM                4
+#define SSLEAY_DIR             5
 
 /* When changing the CRYPTO_LOCK_* list, be sure to maintin the text lock
  * names in cryptlib.c

diff --git a/crypto/cversion.c b/crypto/cversion.c
index 297f8843f58586803ea450af2e1be417186bbbc4..8ecfba7b16bac1dac3dd368589a10fbf49b0b402 100644 (file)
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -98,6 +98,14 @@ const char *SSLeay_version(int t)
                return(buf);
 #else
                return("platform: information not available");
+#endif
+               }
+       if (t == SSLEAY_DIR)
+               {
+#ifdef OPENSSLDIR
+               return "OPENSSLDIR: \"" OPENSSLDIR "\"";
+#else
+               return "OPENSSLDIR: N/A";
 #endif
                }
        return("not available");