Make `openssl version' output lines consistent.

diff --git a/CHANGES b/CHANGES
index 656c8c8c5844a6a89ba070cd1f6a62b87f7365d9..288a739a12a8e74e0222a842de227489f3a2d1e2 100644 (file)
--- 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 8d154ea8b3084704359f5701b935b5fb9d4ad534..0de9c495a875a9830c64e7096aee35f7b1accaa3 100644 (file)
--- 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 f9d28bd5e6111a8cfb85ce1a8c89ea3770006f52..7251d5115c3116c7ec93dd83700da2e4b4fc574c 100644 (file)
--- 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 121bd1dcb5b72593da5762debfbc56b10e2b1b21..d6e452a7de7bc4d294eb9f684c227269102e8569 100644 (file)
--- 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");