diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-10-17 18:15:13 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-10-18 12:22:00 +0200 |
| commit | f5453462117e3deb4b077756e2d24edb2ff3b1af (patch) | |
| tree | d38901ec1a4d3a920fb2d30c4eda3260faa51e55 /include | |
| parent | 9495a6c45bc7cd69845f9a22eec1fbf8ac735b81 (diff) | |
Move the version function declarations to include/openssl/crypto.h
include/openssl/crypto.h is where older similar functions already
live, and since opensslv.h became a template, it's no longer useful
for parsing by util/mknum.pl.
Affected declarations:
unsigned int OPENSSL_version_major(void);
unsigned int OPENSSL_version_minor(void);
unsigned int OPENSSL_version_patch(void);
const char *OPENSSL_version_pre_release(void);
const char *OPENSSL_version_build_metadata(void);
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10205)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/crypto.h | 11 | ||||
| -rw-r--r-- | include/openssl/opensslv.h.in | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 9fb2fa3925..7a74f3d4eb 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -164,6 +164,17 @@ int OPENSSL_hexchar2int(unsigned char c); # define OPENSSL_MALLOC_MAX_NELEMS(type) (((1U<<(sizeof(int)*8-1))-1)/sizeof(type)) +/* + * These functions return the values of OPENSSL_VERSION_MAJOR, + * OPENSSL_VERSION_MINOR, OPENSSL_VERSION_PATCH, OPENSSL_VERSION_PRE_RELEASE + * and OPENSSL_VERSION_BUILD_METADATA, respectively. + */ +unsigned int OPENSSL_version_major(void); +unsigned int OPENSSL_version_minor(void); +unsigned int OPENSSL_version_patch(void); +const char *OPENSSL_version_pre_release(void); +const char *OPENSSL_version_build_metadata(void); + unsigned long OpenSSL_version_num(void); const char *OpenSSL_version(int type); # define OPENSSL_VERSION 0 diff --git a/include/openssl/opensslv.h.in b/include/openssl/opensslv.h.in index 856e8640b8..69ba8c657a 100644 --- a/include/openssl/opensslv.h.in +++ b/include/openssl/opensslv.h.in @@ -103,17 +103,6 @@ _____ ((OPENSSL_VERSION_MAJOR << 16) + OPENSSL_VERSION_MINOR >= ((maj) << 16) + (min)) /* - * These return the values of OPENSSL_VERSION_MAJOR, OPENSSL_VERSION_MINOR, - * OPENSSL_VERSION_PATCH, OPENSSL_VERSION_PRE_RELEASE and - * OPENSSL_VERSION_BUILD_METADATA, respectively. - */ -unsigned int OPENSSL_version_major(void); -unsigned int OPENSSL_version_minor(void); -unsigned int OPENSSL_version_patch(void); -const char *OPENSSL_version_pre_release(void); -const char *OPENSSL_version_build_metadata(void); - -/* * Macros to get the version in easily digested string form, both the short * "MAJOR.MINOR.PATCH" variant (where MAJOR, MINOR and PATCH are replaced * with the values from the corresponding OPENSSL_VERSION_ macros) and the |