summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2018-02-17 06:56:13 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2018-02-17 06:56:13 +0000
commite42a3fb976eb92b70ef1de0aa6a3f59d522780fc (patch)
treef1010a33f07144b578b656c1fc762925a524ea73 /lib
parent0a971798851a4e3c6276f83edfb117c46f634be1 (diff)
Fix behaviour of OpenSSL_version().
The constant values do not map 1:1 to SSLeay_version(), so implement it separately. Issue noted by schwarze@
Diffstat (limited to 'lib')
-rw-r--r--lib/libcrypto/cversion.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/libcrypto/cversion.c b/lib/libcrypto/cversion.c
index b8b1a22a8a8..2d4460d10d8 100644
--- a/lib/libcrypto/cversion.c
+++ b/lib/libcrypto/cversion.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cversion.c,v 1.16 2018/02/14 16:32:06 jsing Exp $ */
+/* $OpenBSD: cversion.c,v 1.17 2018/02/17 06:56:12 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -88,7 +88,21 @@ SSLeay(void)
const char *
OpenSSL_version(int t)
{
- return SSLeay_version(t);
+ switch (t) {
+ case OPENSSL_VERSION:
+ return OPENSSL_VERSION_TEXT;
+ case OPENSSL_BUILT_ON:
+ return("built on: date not available");
+ case OPENSSL_CFLAGS:
+ return("compiler: information not available");
+ case OPENSSL_PLATFORM:
+ return("platform: information not available");
+ case OPENSSL_DIR:
+ return "OPENSSLDIR: \"" OPENSSLDIR "\"";
+ case OPENSSL_ENGINES_DIR:
+ return "ENGINESDIR: N/A";
+ }
+ return("not available");
}
unsigned long