X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fcversion.c;h=0336adaa578482ecb2492c973b5a679920fbdf8e;hp=c3a372258edf518fac83fd5b025bf07c6efcfad2;hb=5951cc004b96cd681ffdf39d3fc9238a1ff597ae;hpb=b4cadc6e1343c01b06613053a90ed2ee85e65090

diff --git a/crypto/cversion.c b/crypto/cversion.c
index c3a372258e..0336adaa57 100644
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -56,24 +56,20 @@
  * [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_VERSION_TEXT;
 	if (t == SSLEAY_BUILT_ON)
 		{
 #ifdef DATE
-		static char buf[sizeof(DATE)+11];
-
-		sprintf(buf,"built on: %s",DATE);
-        	return(buf);
+		return(DATE);
 #else
 		return("built on: date not available");
 #endif
@@ -81,10 +77,7 @@ int t;
 	if (t == SSLEAY_CFLAGS)
 		{
 #ifdef CFLAGS
-		static char buf[sizeof(CFLAGS)+11];
-
-		sprintf(buf,"compiler: %s",CFLAGS);
-		return(buf);
+		return(cflags);
 #else
 		return("compiler: information not available");
 #endif
@@ -92,18 +85,23 @@ int t;
 	if (t == SSLEAY_PLATFORM)
 		{
 #ifdef PLATFORM
-		static char buf[sizeof(PLATFORM)+11];
-
-		sprintf(buf,"platform: %s", PLATFORM);
-		return(buf);
+		return(PLATFORM);
 #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);
 	}