From: Dr. Matthias St. Pierre Date: Mon, 16 Apr 2018 13:19:14 +0000 (+0200) Subject: Revert "Add OPENSSL_VERSION_AT_LEAST" X-Git-Tag: OpenSSL_1_1_0i~187 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbbaeb8973d662ae0d009e0fb6c8975721991b63;p=openssl Revert "Add OPENSSL_VERSION_AT_LEAST" Fixes #5961 This reverts commit d8adfdcd2e5de23f3e1d1a1d10c2fda6f4a65c4a. The macros OPENSSL_MAKE_VERSION() and OPENSSL_VERSION_AT_LEAST() contain errors and don't work as designed. Apart from that, their introduction should be held back until a decision has been mad about the future versioning scheme. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/5968) --- diff --git a/doc/crypto/OPENSSL_VERSION_NUMBER.pod b/doc/crypto/OPENSSL_VERSION_NUMBER.pod index f50faec772..f5429d217e 100644 --- a/doc/crypto/OPENSSL_VERSION_NUMBER.pod +++ b/doc/crypto/OPENSSL_VERSION_NUMBER.pod @@ -47,11 +47,6 @@ number was therefore 0x0090581f. OpenSSL_version_num() returns the version number. -The macro OPENSSL_VERSION_AT_LEAST(major,minor) can be used at compile -time test if the current version is at least as new as the version provided. -The arguments major, minor and fix correspond to the version information -as given above. - OpenSSL_version() returns different strings depending on B: =over 4 diff --git a/doc/ssl/ssl.pod b/doc/ssl/ssl.pod index 4d919072ea..7307a2b584 100644 --- a/doc/ssl/ssl.pod +++ b/doc/ssl/ssl.pod @@ -91,12 +91,6 @@ includes both more private SSL headers and headers from the B library. Whenever you need hard-core details on the internals of the SSL API, look inside this header file. -OPENSSL_VERSION_AT_LEAST(major,minor) can be -used in C<#if> statements in order to determine which version of the library is -being used. This can be used to either enable optional features at compile -time, or work around issues with a previous version. -See L. - =item B Unused. Present for backwards compatibility only. diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index 3532521f15..7221a45e2f 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -46,11 +46,6 @@ extern "C" { # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0i-dev xx XXX xxxx" # endif -#define OPENSSL_MAKE_VERSION(maj,min,fix,patch) ((0x10000000L)+((maj&0xff)<<20)+((min&0xff)<<12)+((fix&0xff)<<4)+patch) - -/* use this for #if tests, should never depend upon fix/patch */ -#define OPENSSL_VERSION_AT_LEAST(maj,min) (OPENSSL_MAKE_VERSION(maj,min, 0, 0) >= OPENSSL_VERSION_NUMBER) - /*- * The macros below are to be used for shared library (.so, .dll, ...) * versioning. That kind of versioning works a bit differently between