[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  7c69495712e3dc9aa8db38271f0c3faeb2037165 (commit)
      from  5c39a55d04ea6e6f734b627a050b9e702788d50d (commit)


- Log -----------------------------------------------------------------
commit 7c69495712e3dc9aa8db38271f0c3faeb2037165
Author: Daniel Bevenius <daniel.bevenius at gmail.com>
Date:   Mon Sep 24 08:43:35 2018 +0200

    Document OPENSSL_VERSION_TEXT macro
    
    This commit documents the OPENSSL_VERSION_TEXT which is currently
    missing in the man page.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7301)

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

Summary of changes:
 doc/man3/OPENSSL_VERSION_NUMBER.pod | 7 ++++++-
 util/private.num                    | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/man3/OPENSSL_VERSION_NUMBER.pod b/doc/man3/OPENSSL_VERSION_NUMBER.pod
index 6eca113..55a55c7 100644
--- a/doc/man3/OPENSSL_VERSION_NUMBER.pod
+++ b/doc/man3/OPENSSL_VERSION_NUMBER.pod
@@ -2,13 +2,14 @@
 
 =head1 NAME
 
-OPENSSL_VERSION_NUMBER, OpenSSL_version,
+OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT, OpenSSL_version,
 OpenSSL_version_num - get OpenSSL version number
 
 =head1 SYNOPSIS
 
  #include <openssl/opensslv.h>
  #define OPENSSL_VERSION_NUMBER 0xnnnnnnnnnL
+ #define OPENSSL_VERSION_TEXT "OpenSSL x.y.z xx XXX xxxx"
 
  #include <openssl/crypto.h>
 
@@ -45,6 +46,10 @@ Version 0.9.5a had an interim interpretation that is like the current one,
 except the patch level got the highest bit set, to keep continuity.  The
 number was therefore 0x0090581f.
 
+OPENSSL_VERSION_TEXT is the text variant of the version number and the
+release date.  For example,
+"OpenSSL 1.0.1a 15 Oct 2015".
+
 OpenSSL_version_num() returns the version number.
 
 OpenSSL_version() returns different strings depending on B<t>:
diff --git a/util/private.num b/util/private.num
index 0391091..9aad2b2 100644
--- a/util/private.num
+++ b/util/private.num
@@ -241,6 +241,7 @@ EVP_seed_cfb                            define
 EVP_sm4_cfb                             define
 OBJ_cleanup                             define deprecated 1.1.0
 OPENSSL_VERSION_NUMBER                  define
+OPENSSL_VERSION_TEXT                    define
 OPENSSL_clear_free                      define
 OPENSSL_clear_realloc                   define
 OPENSSL_free                            define