[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  bddf965d29cb4a9c4d6eeb94aa96dfa47d0cfa5d (commit)
       via  1dea43c3d3c648dc85e22404efc2c64c2b6e3c2f (commit)
      from  53bfacf2205d997bb72731797cbbdcd3ea7b4a64 (commit)


- Log -----------------------------------------------------------------
commit bddf965d29cb4a9c4d6eeb94aa96dfa47d0cfa5d
Author: Pauli <paul.dale at oracle.com>
Date:   Tue May 21 11:30:16 2019 +1000

    Avoid trailing space in "openssl version -o".
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/8963)

commit 1dea43c3d3c648dc85e22404efc2c64c2b6e3c2f
Author: Pauli <paul.dale at oracle.com>
Date:   Tue May 21 11:28:19 2019 +1000

    Always show application and library versions in "openssl version".
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/8963)

-----------------------------------------------------------------------

Summary of changes:
 apps/version.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/apps/version.c b/apps/version.c
index 279aeff..35bfb95 100644
--- a/apps/version.c
+++ b/apps/version.c
@@ -122,35 +122,30 @@ 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)
         printf("%s\n", OpenSSL_version(OPENSSL_PLATFORM));
     if (options) {
-        printf("options:  ");
-        printf("%s ", BN_options());
+        printf("options: ");
+        printf(" %s", BN_options());
 #ifndef OPENSSL_NO_MD2
-        printf("%s ", MD2_options());
+        printf(" %s", MD2_options());
 #endif
 #ifndef OPENSSL_NO_RC4
-        printf("%s ", RC4_options());
+        printf(" %s", RC4_options());
 #endif
 #ifndef OPENSSL_NO_DES
-        printf("%s ", DES_options());
+        printf(" %s", DES_options());
 #endif
 #ifndef OPENSSL_NO_IDEA
-        printf("%s ", IDEA_options());
+        printf(" %s", IDEA_options());
 #endif
 #ifndef OPENSSL_NO_BF
-        printf("%s ", BF_options());
+        printf(" %s", BF_options());
 #endif
         printf("\n");
     }