From d10f052be50d9115b574d1848e600fb93adade25 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openssl.org>
Date: Mon, 8 Mar 1999 12:35:01 +0000
Subject: [PATCH] Make `openssl version' output lines consistent.

---
 CHANGES             |  3 +++
 apps/version.c      |  2 +-
 crypto/Makefile.ssl |  2 +-
 crypto/cversion.c   | 18 +++++++++---------
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index 656c8c8c58..288a739a12 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
 
  Changes between 0.9.1c and 0.9.2
 
+  *) Make `openssl version' output lines consistent.
+     [Ralf S. Engelschall]
+
   *) Fix Win32 symbol export lists for BIO functions: Added
      BIO_get_ex_new_index, BIO_get_ex_num, BIO_get_ex_data and BIO_set_ex_data
      to ms/libeay{16,32}.def.
diff --git a/apps/version.c b/apps/version.c
index 8d154ea8b3..0de9c495a8 100644
--- a/apps/version.c
+++ b/apps/version.c
@@ -107,7 +107,7 @@ char **argv;
 	if (platform) printf("%s\n",SSLeay_version(SSLEAY_PLATFORM));
 	if (options) 
 		{
-		printf("options:");
+		printf("options:  ");
 		printf("%s ",BN_options());
 #ifndef NO_MD2
 		printf("%s ",MD2_options());
diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index f9d28bd5e6..7251d5115c 100644
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -18,7 +18,7 @@ AR=		ar r
 PEX_LIBS=
 EX_LIBS=
  
-CFLAGS= $(INCLUDE) $(CFLAG) -DCFLAGS=" \"$(CC) $(CFLAG)\" " -DPLATFORM=" \"$(PLATFORM)\" "
+CFLAGS= $(INCLUDE) $(CFLAG) -DCFLAGS="\"$(CC) $(CFLAG)\"" -DPLATFORM="\"$(PLATFORM)\""
 
 ERR=crypto
 ERRC=cpt_err
diff --git a/crypto/cversion.c b/crypto/cversion.c
index 121bd1dcb5..d6e452a7de 100644
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -70,34 +70,34 @@ int t;
 	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);
+		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
 		}
 	return("not available");
-- 
GitLab