X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fcversion.c;h=8ecfba7b16bac1dac3dd368589a10fbf49b0b402;hp=28e20a263b476b1eb4d14378b71e3f8f233f7514;hb=4dc719fc37cb2201c8e211c6a684d71477c20f50;hpb=651d0aff98d28e2db146afa1790e9e22f3ef22db

diff --git a/crypto/cversion.c b/crypto/cversion.c
index 28e20a263b..8ecfba7b16 100644
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -59,51 +59,59 @@
 #include <stdio.h>
 #include <string.h>
 #include "cryptlib.h"
-#include "crypto.h"
-#include "date.h"
+#include <openssl/crypto.h>
 
-char *SSLeay_version(t)
-int t;
+#include "buildinf.h"
+
+const char *SSLeay_version(int t)
 	{
 	if (t == SSLEAY_VERSION)
-		return("SSLeay 0.9.1c 22-Dec-1998");
+		return OPENSSL_VERSION_TEXT;
 	if (t == SSLEAY_BUILT_ON)
 		{
 #ifdef DATE
-		static char buf[sizeof(DATE)+10];
+		static char buf[sizeof(DATE)+11];
 
-		sprintf(buf,"built on %s",DATE);
-        	return(buf);
+		sprintf(buf,"built on: %s",DATE);
+		return(buf);
 #else
-		return("build date not available");
+		return("built on: date not available");
 #endif
 		}
 	if (t == SSLEAY_CFLAGS)
 		{
 #ifdef CFLAGS
-		static char buf[sizeof(CFLAGS)+10];
+		static char buf[sizeof(CFLAGS)+11];
 
-		sprintf(buf,"C flags:%s",CFLAGS);
+		sprintf(buf,"compiler: %s",CFLAGS);
 		return(buf);
 #else
-		return("C flags not available");
+		return("compiler: information not available");
 #endif
 		}
 	if (t == SSLEAY_PLATFORM)
 		{
 #ifdef PLATFORM
-		static char buf[sizeof(PLATFORM)+10];
+		static char buf[sizeof(PLATFORM)+11];
 
-		sprintf(buf,"Platform:%s",PLATFORM);
+		sprintf(buf,"platform: %s", PLATFORM);
 		return(buf);
 #else
-		return("Platform information not available");
+		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);
 	}