summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2018-04-16 15:06:24 +0200
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2018-04-16 18:43:52 +0200
commitb7fb239438fb289a69e9420ad1edacf3bd1c5d69 (patch)
tree5141dadfa7e0f5e1f5921278fb465f43005c9576 /doc
parent90b3a620f56da8d8ef9c4c76919d0dca51150685 (diff)
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 <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5968)
Diffstat (limited to 'doc')
-rw-r--r--doc/man3/OPENSSL_VERSION_NUMBER.pod5
-rw-r--r--doc/man7/ssl.pod6
2 files changed, 0 insertions, 11 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<t>:
=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<crypto> 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<OPENSSL_VERSION_NUMBER(3)>.
-
=item B<ssl2.h>
Unused. Present for backwards compatibility only.