diff options
author | Richard Levitte <levitte@openssl.org> | 2019-10-17 18:40:47 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-11-08 16:12:57 +0100 |
commit | 26b7cc0d20d180df28831931b5e75c14c015c5b9 (patch) | |
tree | fdc673afd73b5983d9d202bc318f4074df462b6f /include | |
parent | 310553591cd8fe7ea5f223b9cc41a283f8e6cbf6 (diff) | |
download | openssl-26b7cc0d20d180df28831931b5e75c14c015c5b9.zip openssl-26b7cc0d20d180df28831931b5e75c14c015c5b9.tar.gz openssl-26b7cc0d20d180df28831931b5e75c14c015c5b9.tar.bz2 |
Cleanup include/openssl/opensslv.h.in
Now that we generate include/openssl/opensslv.h, there's no point
keeping some macross around, we can just set a simpler set to their
respective value and be done with it.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10218)
Diffstat (limited to 'include')
-rw-r--r-- | include/openssl/opensslv.h.in | 47 |
1 files changed, 9 insertions, 38 deletions
diff --git a/include/openssl/opensslv.h.in b/include/openssl/opensslv.h.in index 9380504..ffd2bff 100644 --- a/include/openssl/opensslv.h.in +++ b/include/openssl/opensslv.h.in @@ -31,56 +31,25 @@ extern "C" { # define OPENSSL_VERSION_PATCH {- $config{patch} -} /* - * Additional version information, defined only when used. + * Additional version information * * These are also part of the new version scheme, but aren't part * of the version number itself. */ /* Could be: #define OPENSSL_VERSION_PRE_RELEASE "-alpha.1" */ -{- $config{prerelease} - ? << "_____" -# define OPENSSL_VERSION_PRE_RELEASE "$config{prerelease}" -_____ - : << "_____" -# undef OPENSSL_VERSION_PRE_RELEASE -_____ --} +# define OPENSSL_VERSION_PRE_RELEASE "{- $config{prerelease} -}" /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ -{- $build_metadata - ? << "_____" # define OPENSSL_VERSION_BUILD_METADATA "{- $config{build_metadata} -}" -_____ - : << "_____" -# undef OPENSSL_VERSION_BUILD_METADATA -_____ --} /* - * Note: OPENSSL_VERSION_BUILD_METADATA will never be defined by - * the OpenSSL Project, it's entirely reserved for others vendors + * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA + * to be anything but the empty string. Its use is entirely reserved for + * others */ /* - * Absolute string versions of OPENSSL_VERSION_PRE_RELEASE and - * OPENSSL_VERSION_BUILD_METADATA. As opposed to those, which - * may be undefined, these are guaranteed to have strings as - * values. - */ - -# ifdef OPENSSL_VERSION_PRE_RELEASE -# define OPENSSL_VERSION_PRE_RELEASE_STR OPENSSL_VERSION_PRE_RELEASE -# else -# define OPENSSL_VERSION_PRE_RELEASE_STR "" -# endif -# ifdef OPENSSL_VERSION_BUILD_METADATA -# define OPENSSL_VERSION_BUILD_METADATA_STR OPENSSL_VERSION_BUILD_METADATA -# else -# define OPENSSL_VERSION_BUILD_METADATA_STR "" -# endif - -/* * Shared library version * * This is strictly to express ABI version, which may or may not @@ -90,7 +59,7 @@ _____ # define OPENSSL_SHLIB_VERSION {- $config{shlib_version} -} /* - * SECTION 2: USEFUL MACROS AND FUNCTIONS + * SECTION 2: USEFUL MACROS */ /* For checking general API compatibility when preprocessing */ @@ -113,11 +82,13 @@ _____ * These strings are defined separately to allow them to be parsable. */ # define OPENSSL_RELEASE_DATE "{- $config{release_date} -}" -# define OPENSSL_VERSION_TEXT "OpenSSL {- "$config{full_version} $config{release_date}" -}" /* * SECTION 4: BACKWARD COMPATIBILITY */ + +# define OPENSSL_VERSION_TEXT "OpenSSL {- "$config{full_version} $config{release_date}" -}" + /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE # define _OPENSSL_VERSION_PRE_RELEASE 0x0 |