From 23fca6cc5179c982fe39d379254cb289fc141dc1 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Mon, 24 Sep 2018 08:43:35 +0200 Subject: [PATCH] Document OPENSSL_VERSION_TEXT macro This commit documents the OPENSSL_VERSION_TEXT which is currently missing in the man page. Reviewed-by: Tim Hudson Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/7301) (cherry picked from commit 7c69495712e3dc9aa8db38271f0c3faeb2037165) --- 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 6eca1134b1..55a55c706a 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 #define OPENSSL_VERSION_NUMBER 0xnnnnnnnnnL + #define OPENSSL_VERSION_TEXT "OpenSSL x.y.z xx XXX xxxx" #include @@ -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: diff --git a/util/private.num b/util/private.num index 0391091a2f..9aad2b2326 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 -- 2.25.1