From b7fb239438fb289a69e9420ad1edacf3bd1c5d69 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Mon, 16 Apr 2018 15:06:24 +0200 Subject: [PATCH] Revert "Add OPENSSL_VERSION_AT_LEAST" Fixes #5961 This reverts commit 3c5a61dd0f9d9a9eac098419bcaf47d1c296ca81. 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) --- doc/man3/OPENSSL_VERSION_NUMBER.pod | 5 ----- doc/man7/ssl.pod | 6 ------ include/openssl/opensslv.h | 5 ----- 3 files changed, 16 deletions(-) diff --git a/doc/man3/OPENSSL_VERSION_NUMBER.pod b/doc/man3/OPENSSL_VERSION_NUMBER.pod index d5842c0e35..6eca1134b1 100644 --- a/doc/man3/OPENSSL_VERSION_NUMBER.pod +++ b/doc/man3/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/man7/ssl.pod b/doc/man7/ssl.pod index 03efc52007..7cf7d613e6 100644 --- a/doc/man7/ssl.pod +++ b/doc/man7/ssl.pod @@ -89,12 +89,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 06c8b7cd62..241856dfb3 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -42,11 +42,6 @@ extern "C" { # define OPENSSL_VERSION_NUMBER 0x10101005L # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1-pre5-dev xx XXX xxxx" -#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 -- 2.25.1