Make it possible to get ENGINESDIR info from OpenSSL_versions

Have apps/openssl display the result along with OPENSSLDIR

As part of this, add ENGINESDIR in util/mk1mf.pl

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/apps/version.c b/apps/version.c
index 073aa939393edf18ced44e00671fc559dcf04dd0..84929a5efcdf58ea3677c7f8322b8bb75118f42e 100644 (file)
--- a/apps/version.c
+++ b/apps/version.c
@@ -141,6 +141,7 @@ OPTIONS version_options[] = {
     {"a", OPT_A, '-', "Show all data"},
     {"b", OPT_B, '-', "Show build date"},
     {"d", OPT_D, '-', "Show configuration directory"},
+    {"e", OPT_D, '-', "Show engines directory"},
     {"f", OPT_F, '-', "Show compiler flags used"},
     {"o", OPT_O, '-', "Show some internal datatype options"},
     {"p", OPT_P, '-', "Show target build platform"},
@@ -152,6 +153,7 @@ int version_main(int argc, char **argv)
 {
     int ret = 1, dirty = 0;
     int cflags = 0, version = 0, date = 0, options = 0, platform = 0, dir = 0;
+    int engdir = 0;
     char *prog;
     OPTION_CHOICE o;
 
@@ -172,6 +174,9 @@ int version_main(int argc, char **argv)
         case OPT_D:
             dirty = dir = 1;
             break;
+        case OPT_E:
+            dirty = engdir = 1;
+            break;
         case OPT_F:
             dirty = cflags = 1;
             break;
@@ -228,6 +233,8 @@ int version_main(int argc, char **argv)
         printf("%s\n", OpenSSL_version(OPENSSL_CFLAGS));
     if (dir)
         printf("%s\n", OpenSSL_version(OPENSSL_DIR));
+    if (engdir)
+        printf("%s\n", OpenSSL_version(OPENSSL_ENGINES_DIR));
     ret = 0;
  end:
     return (ret);

diff --git a/crypto/cversion.c b/crypto/cversion.c
index 5405e5c84280abe51d5a12016c4db6679718769f..a13ccf429f1dca868d444067083685c86aca2875 100644 (file)
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -100,6 +100,13 @@ const char *OpenSSL_version(int t)
         return "OPENSSLDIR: \"" OPENSSLDIR "\"";
 #else
         return "OPENSSLDIR: N/A";
+#endif
+    }
+    if (t == OPENSSL_ENGINES_DIR) {
+#ifdef ENGINESDIR
+        return "ENGINESDIR: \"" ENGINESDIR "\"";
+#else
+        return "ENGINESDIR: N/A";
 #endif
     }
     return ("not available");

diff --git a/doc/apps/version.pod b/doc/apps/version.pod
index 8ab51dda0c8d7dd64a0a02e2fd18f7f04459603c..01f6d2a0265f77632329c5d1e1f7e169731344a8 100644 (file)
--- a/doc/apps/version.pod
+++ b/doc/apps/version.pod
@@ -15,6 +15,7 @@ B<openssl version>
 [B<-f>]
 [B<-p>]
 [B<-d>]
+[B<-e>]
 
 =head1 DESCRIPTION
 
@@ -56,6 +57,10 @@ platform setting.
 
 OPENSSLDIR setting.
 
+=item B<-e>
+
+ENGINESDIR setting.
+
 =back
 
 =head1 NOTES

diff --git a/doc/crypto/OPENSSL_VERSION_NUMBER.pod b/doc/crypto/OPENSSL_VERSION_NUMBER.pod
index fc16536ba9da5a50b562bdd625643755f9938f15..d87d7197e5dd39f62c1d3bb7e224742ae3289d8d 100644 (file)
--- a/doc/crypto/OPENSSL_VERSION_NUMBER.pod
+++ b/doc/crypto/OPENSSL_VERSION_NUMBER.pod
@@ -77,6 +77,11 @@ if available or "platform: information not available" otherwise.
 The "OPENSSLDIR" setting of the library build in the form "OPENSSLDIR: "...""
 if available or "OPENSSLDIR: N/A" otherwise.
 
+=item OPENSSL_ENGINES_DIR
+
+The "ENGINESDIR" setting of the library build in the form "ENGINESDIR: "...""
+if available or "ENGINESDIR: N/A" otherwise.
+
 =back
 
 For an unknown B<t>, the text "not available" is returned.

diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index d761a97f7fa6ecbc192e24caf92c2486bd2b4675..4199466d66eb37597f2eb49617ee8ba9ffbf38ed 100644 (file)
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -362,6 +362,7 @@ const char *OpenSSL_version(int type);
 # define OPENSSL_BUILT_ON         2
 # define OPENSSL_PLATFORM         3
 # define OPENSSL_DIR              4
+# define OPENSSL_ENGINES_DIR      5
 
 int OPENSSL_issetugid(void);
 

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 1e72b9003b5f6050c531e57e9b3433d43b51090a..e79733d710d8beb9083f59385c29c4611dbfd6fd 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -11,6 +11,7 @@ use Cwd;
 
 $INSTALLTOP="/usr/local";
 $OPENSSLDIR="/usr/local/ssl";
+$ENGINESDIR="/usr/local/lib/engines";
 $OPTIONS="";
 $ssl_version="";
 $banner="\t\@echo Building OpenSSL";
@@ -47,6 +48,7 @@ my %mf_import = (
        OPTIONS        => \$OPTIONS,
        INSTALLTOP     => \$INSTALLTOP,
        OPENSSLDIR     => \$OPENSSLDIR,
+       ENGINESDIR     => \$ENGINESDIR,
        PLATFORM       => \$mf_platform,
        CC             => \$mf_cc,
        CFLAG          => \$mf_cflag,
@@ -636,6 +638,7 @@ $defs .= $preamble if defined $preamble;
 $defs.= <<"EOF";
 INSTALLTOP=$INSTALLTOP
 OPENSSLDIR=$OPENSSLDIR
+ENGINESDIR=$ENGINESDIR
 
 # Set your compiler options
 PLATFORM=$platform
@@ -770,6 +773,7 @@ install: all
        \$(MKDIR) \"\$(INSTALLTOP)${o}include\"
        \$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"
        \$(MKDIR) \"\$(INSTALLTOP)${o}lib\"
+       \$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"
 $extra_install
 
 clean: