]> git.ipfire.org Git - thirdparty/openssl.git/commit
Refactor the computation of API version limits
authorRichard Levitte <levitte@openssl.org>
Thu, 29 Nov 2018 23:05:03 +0000 (23:05 +0000)
committerRichard Levitte <levitte@openssl.org>
Thu, 6 Dec 2018 11:24:48 +0000 (12:24 +0100)
commitfcd2d5a6121ad3e5e65edc714ad99fc36f609f81
tree72b6d74bedbd698bdcd857dda81347c923dd2eb7
parent0695b193428b25b9fbb905ab5b913e69384e2554
Refactor the computation of API version limits

Previously, the API version limit was indicated with a numeric version
number.  This was "natural" in the pre-3.0.0 because the version was
this simple number.

With 3.0.0, the version is divided into three separate numbers, and
it's only the major number that counts, but we still need to be able
to support pre-3.0.0 version limits.

Therefore, we allow OPENSSL_API_COMPAT to be defined with a pre-3.0.0
style numeric version number or with a simple major number, i.e. can
be defined like this for any application:

    -D OPENSSL_API_COMPAT=0x10100000L
    -D OPENSSL_API_COMPAT=3

Since the pre-3.0.0 numerical version numbers are high, it's easy to
distinguish between a simple major number and a pre-3.0.0 numerical
version number and to thereby support both forms at the same time.

Internally, we define the following macros depending on the value of
OPENSSL_API_COMPAT:

    OPENSSL_API_0_9_8
    OPENSSL_API_1_0_0
    OPENSSL_API_1_1_0
    OPENSSL_API_3

They indicate that functions marked for deprecation in the
corresponding major release shall not be built if defined.

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)
64 files changed:
CHANGES
Configure
crypto/asn1/asn1_item_list.h
crypto/asn1/asn1_lib.c
crypto/asn1/x_long.c
crypto/bio/b_sock.c
crypto/bn/bn_depr.c
crypto/bn/bn_lib.c
crypto/conf/conf_sap.c
crypto/cversion.c
crypto/dh/dh_depr.c
crypto/dsa/dsa_depr.c
crypto/dsa/dsa_sign.c
crypto/ec/ec_lib.c
crypto/ec/ec_oct.c
crypto/ec/ecdh_kdf.c
crypto/engine/eng_all.c
crypto/err/err.c
crypto/evp/e_old.c
crypto/hmac/hmac.c
crypto/pkcs12/p12_sbag.c
crypto/rand/rand_lib.c
crypto/rand/rand_win.c
crypto/rsa/rsa_depr.c
crypto/srp/srp_vfy.c
crypto/x509/x509cset.c
doc/man3/OPENSSL_config.pod
doc/man3/RAND_cleanup.pod
doc/man7/openssl_user_macros.pod.in
fuzz/asn1.c
include/openssl/asn1.h
include/openssl/asn1t.h
include/openssl/bio.h
include/openssl/bn.h
include/openssl/comp.h
include/openssl/conf.h
include/openssl/crypto.h
include/openssl/dh.h
include/openssl/dsa.h
include/openssl/ec.h
include/openssl/engine.h
include/openssl/err.h
include/openssl/evp.h
include/openssl/hmac.h
include/openssl/idea.h
include/openssl/lhash.h
include/openssl/objects.h
include/openssl/opensslconf.h.in
include/openssl/pkcs12.h
include/openssl/rand.h
include/openssl/rand_drbg.h
include/openssl/rsa.h
include/openssl/ssl.h
include/openssl/stack.h
include/openssl/tls1.h
include/openssl/ui.h
include/openssl/x509.h
include/openssl/x509_vfy.h
include/openssl/x509v3.h
ssl/methods.c
ssl/ssl_lib.c
test/asn1_decode_test.c
test/asn1_encode_test.c
util/perl/OpenSSL/ParseC.pm