From: Pauli <paul.dale@oracle.com>
Date: Tue, 21 May 2019 01:28:19 +0000 (+1000)
Subject: Always show application and library versions in "openssl version".
X-Git-Tag: openssl-3.0.0-alpha1~2049
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1dea43c3d3c648dc85e22404efc2c64c2b6e3c2f;p=oweals%2Fopenssl.git

Always show application and library versions in "openssl version".

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8963)
---

diff --git a/apps/version.c b/apps/version.c
index 279aeff2ff..83f0ea27b3 100644
--- a/apps/version.c
+++ b/apps/version.c
@@ -122,14 +122,9 @@ opthelp:
     if (!dirty)
         version = 1;
 
-    if (version) {
-        if (strcmp(OpenSSL_version(OPENSSL_FULL_VERSION_STRING),
-                   OPENSSL_FULL_VERSION_STR) == 0)
-            printf("%s\n", OpenSSL_version(OPENSSL_VERSION));
-        else
-            printf("%s (Library: %s)\n",
-                   OPENSSL_VERSION_TEXT, OpenSSL_version(OPENSSL_VERSION));
-    }
+    if (version)
+        printf("%s (Library: %s)\n",
+               OPENSSL_VERSION_TEXT, OpenSSL_version(OPENSSL_VERSION));
     if (date)
         printf("%s\n", OpenSSL_version(OPENSSL_BUILT_ON));
     if (platform)