From: jsing <jsing@openbsd.org>
Date: Sat, 17 Feb 2018 06:56:12 +0000 (+0000)
Subject: Fix behaviour of OpenSSL_version().
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b4b5f48aa5bbe02388570b6bfec3980c4eaef108;p=openbsd

Fix behaviour of OpenSSL_version().

The constant values do not map 1:1 to SSLeay_version(), so implement it
separately.

Issue noted by schwarze@
---

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