summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2018-02-17 06:56:12 +0000
committerjsing <>2018-02-17 06:56:12 +0000
commit0c7165079d7f7c944f8c516a5bb23a71b674c170 (patch)
tree8d3a8cc0e76e096b7f9a585ad5aca0a3cff25671 /src
parentde9079b7a0bd41008efe6e05cef407c977b4e1ae (diff)
downloadopenbsd-0c7165079d7f7c944f8c516a5bb23a71b674c170.tar.gz
openbsd-0c7165079d7f7c944f8c516a5bb23a71b674c170.tar.bz2
openbsd-0c7165079d7f7c944f8c516a5bb23a71b674c170.zip
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 'src')
-rw-r--r--src/lib/libcrypto/cversion.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/lib/libcrypto/cversion.c b/src/lib/libcrypto/cversion.c
index b8b1a22a8a..2d4460d10d 100644
--- a/src/lib/libcrypto/cversion.c
+++ b/src/lib/libcrypto/cversion.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cversion.c,v 1.16 2018/02/14 16:32:06 jsing Exp $ */ 1/* $OpenBSD: cversion.c,v 1.17 2018/02/17 06:56:12 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -88,7 +88,21 @@ SSLeay(void)
88const char * 88const char *
89OpenSSL_version(int t) 89OpenSSL_version(int t)
90{ 90{
91 return SSLeay_version(t); 91 switch (t) {
92 case OPENSSL_VERSION:
93 return OPENSSL_VERSION_TEXT;
94 case OPENSSL_BUILT_ON:
95 return("built on: date not available");
96 case OPENSSL_CFLAGS:
97 return("compiler: information not available");
98 case OPENSSL_PLATFORM:
99 return("platform: information not available");
100 case OPENSSL_DIR:
101 return "OPENSSLDIR: \"" OPENSSLDIR "\"";
102 case OPENSSL_ENGINES_DIR:
103 return "ENGINESDIR: N/A";
104 }
105 return("not available");
92} 106}
93 107
94unsigned long 108unsigned long