Commit 672f943a authored by Richard Levitte's avatar Richard Levitte
Browse files

Switch future deprecation version from 1.2.0 to 3.0 



This is in preparation for a switch to MAJOR.MINOR.PATCH versioning
and calling the next major version 3.0.0.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7724)
parent 2284f64c

crypto/asn1/asn1_item_list.h

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static ASN1_ITEM_EXP *asn1_item_list[] = { 
    ASN1_ITEM_ref(IPAddressRange),

#endif

    ASN1_ITEM_ref(ISSUING_DIST_POINT),

#if OPENSSL_API_COMPAT < 0x10200000L

#if OPENSSL_API_COMPAT < 0x30000000L

    ASN1_ITEM_ref(LONG),

#endif

    ASN1_ITEM_ref(NAME_CONSTRAINTS),
@@ -164,7 +164,7 @@ static ASN1_ITEM_EXP *asn1_item_list[] = { 
    ASN1_ITEM_ref(X509_SIG),

    ASN1_ITEM_ref(X509_VAL),

    ASN1_ITEM_ref(X509),

#if OPENSSL_API_COMPAT < 0x10200000L

#if OPENSSL_API_COMPAT < 0x30000000L

    ASN1_ITEM_ref(ZLONG),

#endif

    ASN1_ITEM_ref(INT32),

crypto/asn1/x_long.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include "internal/cryptlib.h"

#include <openssl/asn1t.h>



#if !(OPENSSL_API_COMPAT < 0x10200000L)

#if !(OPENSSL_API_COMPAT < 0x30000000L)

NON_EMPTY_TRANSLATION_UNIT

#else

crypto/dsa/dsa_sign.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ DSA_SIG *DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) 
    return dsa->meth->dsa_do_sign(dgst, dlen, dsa);

}



#if OPENSSL_API_COMPAT < 0x10200000L

#if OPENSSL_API_COMPAT < 0x30000000L

int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)

{

    return dsa->meth->dsa_sign_setup(dsa, ctx_in, kinvp, rp);

crypto/ec/ec_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, 
    return group->meth->group_get_curve(group, p, a, b, ctx);

}



#if OPENSSL_API_COMPAT < 0x10200000L

#if OPENSSL_API_COMPAT < 0x30000000L

int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,

                           const BIGNUM *b, BN_CTX *ctx)

{
@@ -726,7 +726,7 @@ int EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point, 
    return 1;

}



#if OPENSSL_API_COMPAT < 0x10200000L

#if OPENSSL_API_COMPAT < 0x30000000L

int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group,

                                        EC_POINT *point, const BIGNUM *x,

                                        const BIGNUM *y, BN_CTX *ctx)
@@ -764,7 +764,7 @@ int EC_POINT_get_affine_coordinates(const EC_GROUP *group, 
    return group->meth->point_get_affine_coordinates(group, point, x, y, ctx);

}



#if OPENSSL_API_COMPAT < 0x10200000L

#if OPENSSL_API_COMPAT < 0x30000000L

int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,

                                        const EC_POINT *point, BIGNUM *x,

                                        BIGNUM *y, BN_CTX *ctx)

crypto/ec/ec_oct.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point, 
                                                         y_bit, ctx);

}



#if OPENSSL_API_COMPAT < 0x10200000L

#if OPENSSL_API_COMPAT < 0x30000000L

int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,

                                            EC_POINT *point, const BIGNUM *x,

                                            int y_bit, BN_CTX *ctx)