diff options
author | Bodo Möller <bodo@openssl.org> | 2001-01-10 15:15:36 +0000 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 2001-01-10 15:15:36 +0000 |
commit | 673b3fde824b8cafe33d1c908e890e42645a0ade (patch) | |
tree | dac80e4bdf2cca01c9ba9a59ed08baa76c52e1eb | |
parent | a87e50a945f2bb45b58f5d9b7f16bba5c9237a2f (diff) |
Add SSLEAY_DIR argument code for SSLeay_version.
Add '-d' option for 'openssl version' (included in '-a').
-rw-r--r-- | CHANGES | 5 | ||||
-rw-r--r-- | apps/version.c | 7 | ||||
-rw-r--r-- | crypto/crypto.h | 1 | ||||
-rw-r--r-- | crypto/cversion.c | 8 |
4 files changed, 19 insertions, 2 deletions
@@ -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 f5c9adc254..c29343b4fa 100644 --- 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 d5a397a63d..45309496a7 100644 --- 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 297f8843f5..8ecfba7b16 100644 --- a/crypto/cversion.c +++ b/crypto/cversion.c @@ -100,6 +100,14 @@ const char *SSLeay_version(int t) return("platform: information not available"); #endif } + if (t == SSLEAY_DIR) + { +#ifdef OPENSSLDIR + return "OPENSSLDIR: \"" OPENSSLDIR "\""; +#else + return "OPENSSLDIR: N/A"; +#endif + } return("not available"); } |