summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMichael Richardson <mcr@sandelman.ca>2018-02-01 13:22:48 -0500
committerRich Salz <rsalz@openssl.org>2018-02-01 13:22:48 -0500
commit3c5a61dd0f9d9a9eac098419bcaf47d1c296ca81 (patch)
tree614596820eb1a0405358a338b7e2e7dfff488f7e /include
parent67c836e860c735cf1b039ef52973237fd26b74d6 (diff)
Add OPENSSL_VERSION_AT_LEAST
added macro to create version number use the macro to build OPENSSL_VERSION_AT_LEAST(maj,min,fix) so that customers of libssl (such as ruby-openssl) do not need to be so aware of openssl version numbers. includes updates to ssl(7) and OPENSSL_VERSION_NUMBER(3) man page Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5212)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/opensslv.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index c6e15a5aa3..420a1c96aa 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -42,6 +42,11 @@ extern "C" {
# define OPENSSL_VERSION_NUMBER 0x10101000L
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1-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