X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fcversion.c;h=ea9f25fd16663dc93d9290ea19358db066c4861d;hb=6715034002f2d7831b234c50a2a072320905cafe;hp=d6e452a7de7bc4d294eb9f684c227269102e8569;hpb=d10f052be50d9115b574d1848e600fb93adade25;p=oweals%2Fopenssl.git

diff --git a/crypto/cversion.c b/crypto/cversion.c
index d6e452a7de..ea9f25fd16 100644
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -56,24 +56,23 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
-#include <string.h>
 #include "cryptlib.h"
-#include "crypto.h"
-#include "date.h"
 
-char *SSLeay_version(t)
-int t;
+#ifndef NO_WINDOWS_BRAINDEATH
+#include "buildinf.h"
+#endif
+
+const char *SSLeay_version(int t)
 	{
 	if (t == SSLEAY_VERSION)
-		return("OpenSSL 0.9.2 31-Dec-1998");
+		return OPENSSL_VERSION_TEXT;
 	if (t == SSLEAY_BUILT_ON)
 		{
 #ifdef DATE
 		static char buf[sizeof(DATE)+11];
 
-		sprintf(buf,"built on: %s",DATE);
-        	return(buf);
+		BIO_snprintf(buf,sizeof buf,"built on: %s",DATE);
+		return(buf);
 #else
 		return("built on: date not available");
 #endif
@@ -83,7 +82,7 @@ int t;
 #ifdef CFLAGS
 		static char buf[sizeof(CFLAGS)+11];
 
-		sprintf(buf,"compiler: %s",CFLAGS);
+		BIO_snprintf(buf,sizeof buf,"compiler: %s",CFLAGS);
 		return(buf);
 #else
 		return("compiler: information not available");
@@ -94,16 +93,24 @@ int t;
 #ifdef PLATFORM
 		static char buf[sizeof(PLATFORM)+11];
 
-		sprintf(buf,"platform: %s", PLATFORM);
+		BIO_snprintf(buf,sizeof buf,"platform: %s", PLATFORM);
 		return(buf);
 #else
 		return("platform: information not available");
+#endif
+		}
+	if (t == SSLEAY_DIR)
+		{
+#ifdef OPENSSLDIR
+		return "OPENSSLDIR: \"" OPENSSLDIR "\"";
+#else
+		return "OPENSSLDIR: N/A";
 #endif
 		}
 	return("not available");
 	}
 
-unsigned long SSLeay()
+unsigned long SSLeay(void)
 	{
 	return(SSLEAY_VERSION_NUMBER);
 	}