summaryrefslogtreecommitdiffstats
path: root/util/libcrypto.num
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-09-27 15:56:35 +0200
committerRichard Levitte <levitte@openssl.org>2018-12-06 12:24:47 +0100
commit3a63dbef15b62b121c5df8762f8cb915fb06b27a (patch)
tree5408ad7c75146d2a70da69adf99c395f5fa67c19 /util/libcrypto.num
parent672f943ad6c6d16b1f65a77b8e2c83c8f44a112b (diff)
Switch to MAJOR.MINOR.PATCH versioning and version 3.0.0-dev
We're strictly use version numbers of the form MAJOR.MINOR.PATCH. Letter releases are things of days past. The most central change is that we now express the version number with three macros, one for each part of the version number: OPENSSL_VERSION_MAJOR OPENSSL_VERSION_MINOR OPENSSL_VERSION_PATCH We also provide two additional macros to express pre-release and build metadata information (also specified in semantic versioning): OPENSSL_VERSION_PRE_RELEASE OPENSSL_VERSION_BUILD_METADATA To get the library's idea of all those values, we introduce the following functions: 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); Additionally, for shared library versioning (which is out of scope in semantic versioning, but that we still need): OPENSSL_SHLIB_VERSION We also provide a macro that contains the release date. This is not part of the version number, but is extra information that we want to be able to display: OPENSSL_RELEASE_DATE Finally, also provide the following convenience functions: const char *OPENSSL_version_text(void); const char *OPENSSL_version_text_full(void); The following macros and functions are deprecated, and while currently existing for backward compatibility, they are expected to disappear: OPENSSL_VERSION_NUMBER OPENSSL_VERSION_TEXT OPENSSL_VERSION OpenSSL_version_num() OpenSSL_version() Also, this function is introduced to replace OpenSSL_version() for all indexes except for OPENSSL_VERSION: OPENSSL_info() For configuration, the option 'newversion-only' is added to disable all the macros and functions that are mentioned as deprecated above. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7724)
Diffstat (limited to 'util/libcrypto.num')
-rw-r--r--util/libcrypto.num59
1 files changed, 32 insertions, 27 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 85a15a0480..964f581667 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -3263,7 +3263,7 @@ CMS_RecipientInfo_get0_pkey_ctx 3215 1_1_0 EXIST::FUNCTION:CMS
OCSP_REQINFO_free 3216 1_1_0 EXIST::FUNCTION:OCSP
AUTHORITY_KEYID_new 3217 1_1_0 EXIST::FUNCTION:
i2d_DIST_POINT_NAME 3218 1_1_0 EXIST::FUNCTION:
-OpenSSL_version_num 3219 1_1_0 EXIST::FUNCTION:
+OpenSSL_version_num 3219 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_3
OCSP_CERTID_free 3220 1_1_0 EXIST::FUNCTION:OCSP
BIO_hex_string 3221 1_1_0 EXIST::FUNCTION:
X509_REQ_sign_ctx 3222 1_1_0 EXIST::FUNCTION:
@@ -4577,29 +4577,34 @@ OCSP_resp_get0_respdata 4530 1_1_0j EXIST::FUNCTION:OCSP
EVP_MD_CTX_set_pkey_ctx 4531 1_1_1 EXIST::FUNCTION:
EVP_PKEY_meth_set_digest_custom 4532 1_1_1 EXIST::FUNCTION:
EVP_PKEY_meth_get_digest_custom 4533 1_1_1 EXIST::FUNCTION:
-EVP_MAC_CTX_new 4534 1_1_2 EXIST::FUNCTION:
-EVP_MAC_CTX_new_id 4535 1_1_2 EXIST::FUNCTION:
-EVP_MAC_CTX_free 4536 1_1_2 EXIST::FUNCTION:
-EVP_MAC_CTX_copy 4537 1_1_2 EXIST::FUNCTION:
-EVP_MAC_CTX_mac 4538 1_1_2 EXIST::FUNCTION:
-EVP_MAC_size 4539 1_1_2 EXIST::FUNCTION:
-EVP_MAC_init 4540 1_1_2 EXIST::FUNCTION:
-EVP_MAC_update 4541 1_1_2 EXIST::FUNCTION:
-EVP_MAC_final 4542 1_1_2 EXIST::FUNCTION:
-EVP_MAC_ctrl 4543 1_1_2 EXIST::FUNCTION:
-EVP_MAC_vctrl 4544 1_1_2 EXIST::FUNCTION:
-EVP_MAC_ctrl_str 4545 1_1_2 EXIST::FUNCTION:
-EVP_MAC_str2ctrl 4546 1_1_2 EXIST::FUNCTION:
-EVP_MAC_hex2ctrl 4547 1_1_2 EXIST::FUNCTION:
-EVP_MAC_nid 4548 1_1_2 EXIST::FUNCTION:
-EVP_get_macbyname 4549 1_1_2 EXIST::FUNCTION:
-EVP_MAC_do_all 4550 1_1_2 EXIST::FUNCTION:
-EVP_MAC_do_all_sorted 4551 1_1_2 EXIST::FUNCTION:
-EVP_str2ctrl 4552 1_1_2 EXIST::FUNCTION:
-EVP_hex2ctrl 4553 1_1_2 EXIST::FUNCTION:
-EVP_PKEY_supports_digest_nid 4554 1_1_2 EXIST::FUNCTION:
-SRP_VBASE_add0_user 4555 1_1_2 EXIST::FUNCTION:SRP
-SRP_user_pwd_new 4556 1_1_2 EXIST::FUNCTION:SRP
-SRP_user_pwd_set_gN 4557 1_1_2 EXIST::FUNCTION:SRP
-SRP_user_pwd_set1_ids 4558 1_1_2 EXIST::FUNCTION:SRP
-SRP_user_pwd_set0_sv 4559 1_1_2 EXIST::FUNCTION:SRP
+EVP_MAC_CTX_new 4534 3_0_0 EXIST::FUNCTION:
+EVP_MAC_CTX_new_id 4535 3_0_0 EXIST::FUNCTION:
+EVP_MAC_CTX_free 4536 3_0_0 EXIST::FUNCTION:
+EVP_MAC_CTX_copy 4537 3_0_0 EXIST::FUNCTION:
+EVP_MAC_CTX_mac 4538 3_0_0 EXIST::FUNCTION:
+EVP_MAC_size 4539 3_0_0 EXIST::FUNCTION:
+EVP_MAC_init 4540 3_0_0 EXIST::FUNCTION:
+EVP_MAC_update 4541 3_0_0 EXIST::FUNCTION:
+EVP_MAC_final 4542 3_0_0 EXIST::FUNCTION:
+EVP_MAC_ctrl 4543 3_0_0 EXIST::FUNCTION:
+EVP_MAC_vctrl 4544 3_0_0 EXIST::FUNCTION:
+EVP_MAC_ctrl_str 4545 3_0_0 EXIST::FUNCTION:
+EVP_MAC_str2ctrl 4546 3_0_0 EXIST::FUNCTION:
+EVP_MAC_hex2ctrl 4547 3_0_0 EXIST::FUNCTION:
+EVP_MAC_nid 4548 3_0_0 EXIST::FUNCTION:
+EVP_get_macbyname 4549 3_0_0 EXIST::FUNCTION:
+EVP_MAC_do_all 4550 3_0_0 EXIST::FUNCTION:
+EVP_MAC_do_all_sorted 4551 3_0_0 EXIST::FUNCTION:
+EVP_str2ctrl 4552 3_0_0 EXIST::FUNCTION:
+EVP_hex2ctrl 4553 3_0_0 EXIST::FUNCTION:
+EVP_PKEY_supports_digest_nid 4554 3_0_0 EXIST::FUNCTION:
+SRP_VBASE_add0_user 4555 3_0_0 EXIST::FUNCTION:SRP
+SRP_user_pwd_new 4556 3_0_0 EXIST::FUNCTION:SRP
+SRP_user_pwd_set_gN 4557 3_0_0 EXIST::FUNCTION:SRP
+SRP_user_pwd_set1_ids 4558 3_0_0 EXIST::FUNCTION:SRP
+SRP_user_pwd_set0_sv 4559 3_0_0 EXIST::FUNCTION:SRP
+OPENSSL_version_major 4560 3_0_0 EXIST::FUNCTION:
+OPENSSL_version_minor 4561 3_0_0 EXIST::FUNCTION:
+OPENSSL_version_patch 4562 3_0_0 EXIST::FUNCTION:
+OPENSSL_version_pre_release 4563 3_0_0 EXIST::FUNCTION:
+OPENSSL_version_build_metadata 4564 3_0_0 EXIST::FUNCTION: