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: 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)

diff --git a/crypto/asn1/asn1_item_list.h b/crypto/asn1/asn1_item_list.h
index db8107ed1b1905e1f22ddd8360521dad67f4dc4b..3e53c632370f1b8025f48c931fddbdf210c57cb0 100644 (file)
--- a/crypto/asn1/asn1_item_list.h
+++ b/crypto/asn1/asn1_item_list.h
@@ -78,7 +78,7 @@ static ASN1_ITEM_EXP *asn1_item_list[] = {
     ASN1_ITEM_ref(IPAddressRange),
 #endif
     ASN1_ITEM_ref(ISSUING_DIST_POINT),
     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),
     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),
     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),
     ASN1_ITEM_ref(ZLONG),
 #endif
     ASN1_ITEM_ref(INT32),

diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c
index bf9371ef55aaf123821f32a7fc9d9c6016246dfb..537db1b38138387a26e3af7e2dd9761994186cd4 100644 (file)
--- a/crypto/asn1/x_long.c
+++ b/crypto/asn1/x_long.c
@@ -11,7 +11,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 
 #include "internal/cryptlib.h"
 #include <openssl/asn1t.h>
 

-#if !(OPENSSL_API_COMPAT < 0x10200000L)
+#if !(OPENSSL_API_COMPAT < 0x30000000L)

 NON_EMPTY_TRANSLATION_UNIT
 #else
 
 NON_EMPTY_TRANSLATION_UNIT
 #else
 

diff --git a/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c
index e9466b29f1d7bfd3139f038e6cd3642780d2ebd3..2304cc9bee7c68dfd7c330c96a7a59483e22a60a 100644 (file)
--- a/crypto/dsa/dsa_sign.c
+++ b/crypto/dsa/dsa_sign.c
@@ -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);
 }
 
     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);
 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);

diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
index b89e3979d9dcb73a5e702e7c3b582a38f33b06ba..e3d249a0badbeec3c09c6ca3269ac077c2b315a2 100644 (file)
--- a/crypto/ec/ec_lib.c
+++ b/crypto/ec/ec_lib.c
@@ -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);
 }
 
     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)
 {
 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;
 }
 
     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)
 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);
 }
 
     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)
 int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
                                         const EC_POINT *point, BIGNUM *x,
                                         BIGNUM *y, BN_CTX *ctx)

diff --git a/crypto/ec/ec_oct.c b/crypto/ec/ec_oct.c
index 522f79e67360d79c7df379b8b1fbd2078e5c95c9..f6295c92a7d9e238f23023a6047ae9b1067651ec 100644 (file)
--- a/crypto/ec/ec_oct.c
+++ b/crypto/ec/ec_oct.c
@@ -49,7 +49,7 @@ int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
                                                          y_bit, ctx);
 }
 
                                                          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)
 int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
                                             EC_POINT *point, const BIGNUM *x,
                                             int y_bit, BN_CTX *ctx)

diff --git a/fuzz/asn1.c b/fuzz/asn1.c
index fd2271bf5212e3c4a023d3ac828ab2631b585797..fad561eb8b107f1318cbd195df93da5d49905f68 100644 (file)
--- a/fuzz/asn1.c
+++ b/fuzz/asn1.c
@@ -106,7 +106,7 @@ static ASN1_ITEM_EXP *item_type[] = {
     ASN1_ITEM_ref(IPAddressRange),
 #endif
     ASN1_ITEM_ref(ISSUING_DIST_POINT),
     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),
     ASN1_ITEM_ref(LONG),
 #endif
     ASN1_ITEM_ref(NAME_CONSTRAINTS),


@@ -187,7 +187,7 @@ static ASN1_ITEM_EXP *item_type[] = {
     ASN1_ITEM_ref(X509_REVOKED),
     ASN1_ITEM_ref(X509_SIG),
     ASN1_ITEM_ref(X509_VAL),
     ASN1_ITEM_ref(X509_REVOKED),
     ASN1_ITEM_ref(X509_SIG),
     ASN1_ITEM_ref(X509_VAL),

-#if OPENSSL_API_COMPAT < 0x10200000L
+#if OPENSSL_API_COMPAT < 0x30000000L

     ASN1_ITEM_ref(ZLONG),
 #endif
     ASN1_ITEM_ref(INT32),
     ASN1_ITEM_ref(ZLONG),
 #endif
     ASN1_ITEM_ref(INT32),

diff --git a/include/openssl/asn1t.h b/include/openssl/asn1t.h
index a450ba0d9dea5df587c58a2b0c3fe10e235adcea..c15232078516cd6637fb50679158a052b74efc16 100644 (file)
--- a/include/openssl/asn1t.h
+++ b/include/openssl/asn1t.h
@@ -915,7 +915,7 @@ DECLARE_ASN1_ITEM(ZINT64)
 DECLARE_ASN1_ITEM(UINT64)
 DECLARE_ASN1_ITEM(ZUINT64)
 
 DECLARE_ASN1_ITEM(UINT64)
 DECLARE_ASN1_ITEM(ZUINT64)
 

-# if OPENSSL_API_COMPAT < 0x10200000L
+# if OPENSSL_API_COMPAT < 0x30000000L

 /*
  * LONG and ZLONG are strongly discouraged for use as stored data, as the
  * underlying C type (long) differs in size depending on the architecture.
 /*
  * LONG and ZLONG are strongly discouraged for use as stored data, as the
  * underlying C type (long) differs in size depending on the architecture.

diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h
index 822eff347a293abf4c1291ab7c4d76850495bb68..30454f1a48ef5149f1563762b7e119efb68df292 100644 (file)
--- a/include/openssl/dsa.h
+++ b/include/openssl/dsa.h
@@ -99,7 +99,7 @@ int DSA_size(const DSA *);
 int DSA_bits(const DSA *d);
 int DSA_security_bits(const DSA *d);
         /* next 4 return -1 on error */
 int DSA_bits(const DSA *d);
 int DSA_security_bits(const DSA *d);
         /* next 4 return -1 on error */

-DEPRECATEDIN_1_2_0(int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp))
+DEPRECATEDIN_3(int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp))

 int DSA_sign(int type, const unsigned char *dgst, int dlen,
              unsigned char *sig, unsigned int *siglen, DSA *dsa);
 int DSA_verify(int type, const unsigned char *dgst, int dgst_len,
 int DSA_sign(int type, const unsigned char *dgst, int dlen,
              unsigned char *sig, unsigned int *siglen, DSA *dsa);
 int DSA_verify(int type, const unsigned char *dgst, int dgst_len,

diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index 747239a5a630eda438bbca8b4bc34e1048fa28c2..90a40299a13d0f6c35c65f6b43e365b69233764d 100644 (file)
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -258,9 +258,9 @@ int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */

-DEPRECATEDIN_1_2_0(int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p,
-                                              const BIGNUM *a, const BIGNUM *b,
-                                              BN_CTX *ctx))
+DEPRECATEDIN_3(int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p,
+                                          const BIGNUM *a, const BIGNUM *b,
+                                          BN_CTX *ctx))

 
 /** Gets the parameters of an ec curve. Synonym for EC_GROUP_get_curve
  *  \param  group  EC_GROUP object
 
 /** Gets the parameters of an ec curve. Synonym for EC_GROUP_get_curve
  *  \param  group  EC_GROUP object


@@ -271,9 +271,9 @@ DEPRECATEDIN_1_2_0(int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p,
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */

-DEPRECATEDIN_1_2_0(int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p,
-                                              BIGNUM *a, BIGNUM *b,
-                                              BN_CTX *ctx))
+DEPRECATEDIN_3(int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p,
+                                          BIGNUM *a, BIGNUM *b,
+                                          BN_CTX *ctx))

 
 # ifndef OPENSSL_NO_EC2M
 /** Sets the parameter of an ec curve. Synonym for EC_GROUP_set_curve
 
 # ifndef OPENSSL_NO_EC2M
 /** Sets the parameter of an ec curve. Synonym for EC_GROUP_set_curve


@@ -285,9 +285,9 @@ DEPRECATEDIN_1_2_0(int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p,
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */

-DEPRECATEDIN_1_2_0(int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p,
-                                               const BIGNUM *a, const BIGNUM *b,
-                                               BN_CTX *ctx))
+DEPRECATEDIN_3(int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p,
+                                           const BIGNUM *a, const BIGNUM *b,
+                                           BN_CTX *ctx))

 
 /** Gets the parameters of an ec curve. Synonym for EC_GROUP_get_curve
  *  \param  group  EC_GROUP object
 
 /** Gets the parameters of an ec curve. Synonym for EC_GROUP_get_curve
  *  \param  group  EC_GROUP object


@@ -298,9 +298,9 @@ DEPRECATEDIN_1_2_0(int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p,
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */

-DEPRECATEDIN_1_2_0(int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p,
-                                               BIGNUM *a, BIGNUM *b,
-                                               BN_CTX *ctx))
+DEPRECATEDIN_3(int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p,
+                                           BIGNUM *a, BIGNUM *b,
+                                           BN_CTX *ctx))

 # endif
 /** Returns the number of bits needed to represent a field element
  *  \param  group  EC_GROUP object
 # endif
 /** Returns the number of bits needed to represent a field element
  *  \param  group  EC_GROUP object


@@ -525,11 +525,11 @@ int EC_POINT_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *p,
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */

-DEPRECATEDIN_1_2_0(int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group,
-                                                           EC_POINT *p,
-                                                           const BIGNUM *x,
-                                                           const BIGNUM *y,
-                                                           BN_CTX *ctx))
+DEPRECATEDIN_3(int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group,
+                                                       EC_POINT *p,
+                                                       const BIGNUM *x,
+                                                       const BIGNUM *y,
+                                                       BN_CTX *ctx))

 
 /** Gets the affine coordinates of an EC_POINT. A synonym of
  *  EC_POINT_get_affine_coordinates
 
 /** Gets the affine coordinates of an EC_POINT. A synonym of
  *  EC_POINT_get_affine_coordinates


@@ -540,11 +540,11 @@ DEPRECATEDIN_1_2_0(int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */

-DEPRECATEDIN_1_2_0(int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
-                                                           const EC_POINT *p,
-                                                           BIGNUM *x,
-                                                           BIGNUM *y,
-                                                           BN_CTX *ctx))
+DEPRECATEDIN_3(int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
+                                                       const EC_POINT *p,
+                                                       BIGNUM *x,
+                                                       BIGNUM *y,
+                                                       BN_CTX *ctx))

 
 /** Sets the x9.62 compressed coordinates of a EC_POINT
  *  \param  group  underlying EC_GROUP object
 
 /** Sets the x9.62 compressed coordinates of a EC_POINT
  *  \param  group  underlying EC_GROUP object


@@ -567,11 +567,11 @@ int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *p,
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */

-DEPRECATEDIN_1_2_0(int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
-                                                               EC_POINT *p,
-                                                               const BIGNUM *x,
-                                                               int y_bit,
-                                                               BN_CTX *ctx))
+DEPRECATEDIN_3(int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
+                                                           EC_POINT *p,
+                                                           const BIGNUM *x,
+                                                           int y_bit,
+                                                           BN_CTX *ctx))

 # ifndef OPENSSL_NO_EC2M
 /** Sets the affine coordinates of an EC_POINT. A synonym of
  *  EC_POINT_set_affine_coordinates
 # ifndef OPENSSL_NO_EC2M
 /** Sets the affine coordinates of an EC_POINT. A synonym of
  *  EC_POINT_set_affine_coordinates


@@ -582,11 +582,11 @@ DEPRECATEDIN_1_2_0(int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *g
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */

-DEPRECATEDIN_1_2_0(int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group,
-                                                            EC_POINT *p,
-                                                            const BIGNUM *x,
-                                                            const BIGNUM *y,
-                                                            BN_CTX *ctx))
+DEPRECATEDIN_3(int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group,
+                                                        EC_POINT *p,
+                                                        const BIGNUM *x,
+                                                        const BIGNUM *y,
+                                                        BN_CTX *ctx))

 
 /** Gets the affine coordinates of an EC_POINT. A synonym of
  *  EC_POINT_get_affine_coordinates
 
 /** Gets the affine coordinates of an EC_POINT. A synonym of
  *  EC_POINT_get_affine_coordinates


@@ -597,11 +597,11 @@ DEPRECATEDIN_1_2_0(int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *grou
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */

-DEPRECATEDIN_1_2_0(int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
-                                                            const EC_POINT *p,
-                                                            BIGNUM *x,
-                                                            BIGNUM *y,
-                                                            BN_CTX *ctx))
+DEPRECATEDIN_3(int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
+                                                        const EC_POINT *p,
+                                                        BIGNUM *x,
+                                                        BIGNUM *y,
+                                                        BN_CTX *ctx))

 
 /** Sets the x9.62 compressed coordinates of a EC_POINT. A synonym of
  *  EC_POINT_set_compressed_coordinates
 
 /** Sets the x9.62 compressed coordinates of a EC_POINT. A synonym of
  *  EC_POINT_set_compressed_coordinates


@@ -612,11 +612,11 @@ DEPRECATEDIN_1_2_0(int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *grou
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */

-DEPRECATEDIN_1_2_0(int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group,
-                                                                EC_POINT *p,
-                                                                const BIGNUM *x,
-                                                                int y_bit,
-                                                                BN_CTX *ctx))
+DEPRECATEDIN_3(int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group,
+                                                            EC_POINT *p,
+                                                            const BIGNUM *x,
+                                                            int y_bit,
+                                                            BN_CTX *ctx))

 # endif
 /** Encodes a EC_POINT object to a octet string
  *  \param  group  underlying EC_GROUP object
 # endif
 /** Encodes a EC_POINT object to a octet string
  *  \param  group  underlying EC_GROUP object


@@ -1112,10 +1112,10 @@ EC_KEY *EC_KEY_new_method(ENGINE *engine);
  *  it is actually specified in ANSI X9.63.
  *  This identifier is retained for backwards compatibility
  */
  *  it is actually specified in ANSI X9.63.
  *  This identifier is retained for backwards compatibility
  */

-DEPRECATEDIN_1_2_0(int ECDH_KDF_X9_62(unsigned char *out, size_t outlen,
-                   const unsigned char *Z, size_t Zlen,
-                   const unsigned char *sinfo, size_t sinfolen,
-                   const EVP_MD *md))
+DEPRECATEDIN_3(int ECDH_KDF_X9_62(unsigned char *out, size_t outlen,
+                                  const unsigned char *Z, size_t Zlen,
+                                  const unsigned char *sinfo, size_t sinfolen,
+                                  const EVP_MD *md))

 
 int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
                      const EC_KEY *ecdh,
 
 int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
                      const EC_KEY *ecdh,

diff --git a/include/openssl/hmac.h b/include/openssl/hmac.h
index 458efc1d5181a89bb8ccab67e296da9ffcb27a7f..e24dde2a576bfbd9d1a5c7e56e272996f4fdcc6d 100644 (file)
--- a/include/openssl/hmac.h
+++ b/include/openssl/hmac.h
@@ -14,7 +14,7 @@
 
 # include <openssl/evp.h>
 
 
 # include <openssl/evp.h>
 

-# if OPENSSL_API_COMPAT < 0x10200000L
+# if OPENSSL_API_COMPAT < 0x30000000L

 #  define HMAC_MAX_MD_CBLOCK      128    /* Deprecated */
 # endif
 
 #  define HMAC_MAX_MD_CBLOCK      128    /* Deprecated */
 # endif
 

diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in
index 41d1264faa5b6b9e12600d40375e184c6a9dbbc8..e44fe35bccac1a56983c3066e3890124b21d4266 100644 (file)
--- a/include/openssl/opensslconf.h.in
+++ b/include/openssl/opensslconf.h.in
@@ -86,15 +86,15 @@ extern "C" {
 #endif
 
 /*
 #endif
 
 /*

- * Do not deprecate things to be deprecated in version 1.2.0 before the
+ * Do not deprecate things to be deprecated in version 3.0 before the

  * OpenSSL version number matches.
  */
  * OpenSSL version number matches.
  */

-#if OPENSSL_VERSION_NUMBER < 0x10200000L
-# define DEPRECATEDIN_1_2_0(f)   f;
-#elif OPENSSL_API_COMPAT < 0x10200000L
-# define DEPRECATEDIN_1_2_0(f)   DECLARE_DEPRECATED(f)
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
+# define DEPRECATEDIN_3(f)       f;
+#elif OPENSSL_API_COMPAT < 0x30000000L
+# define DEPRECATEDIN_3(f)       DECLARE_DEPRECATED(f)

 #else
 #else

-# define DEPRECATEDIN_1_2_0(f)
+# define DEPRECATEDIN_3(f)

 #endif
 
 #if OPENSSL_API_COMPAT < 0x10100000L
 #endif
 
 #if OPENSSL_API_COMPAT < 0x10100000L

diff --git a/include/openssl/rand_drbg.h b/include/openssl/rand_drbg.h
index df44701e21a120f3006e81f5afaa21b6fc711eeb..237fe4520654a93016dce3e472f06fd803006d99 100644 (file)
--- a/include/openssl/rand_drbg.h
+++ b/include/openssl/rand_drbg.h
@@ -36,7 +36,7 @@
 /* Used by RAND_DRBG_set_defaults() to set the private DRBG type and flags. */
 # define RAND_DRBG_FLAG_PRIVATE              0x10
 
 /* Used by RAND_DRBG_set_defaults() to set the private DRBG type and flags. */
 # define RAND_DRBG_FLAG_PRIVATE              0x10
 

-# if OPENSSL_API_COMPAT < 0x10200000L
+# if OPENSSL_API_COMPAT < 0x30000000L

 /* This #define was replaced by an internal constant and should not be used. */
 #  define RAND_DRBG_USED_FLAGS  (RAND_DRBG_FLAG_CTR_NO_DF)
 # endif
 /* This #define was replaced by an internal constant and should not be used. */
 #  define RAND_DRBG_USED_FLAGS  (RAND_DRBG_FLAG_CTR_NO_DF)
 # endif

diff --git a/include/openssl/ui.h b/include/openssl/ui.h
index 7c721ec818ddbffb6d10c94bc4c4af259a12411e..701dd8592806cc7a14493bec82624b9f681681dc 100644 (file)
--- a/include/openssl/ui.h
+++ b/include/openssl/ui.h
@@ -21,7 +21,7 @@
 # include <openssl/uierr.h>
 
 /* For compatibility reasons, the macro OPENSSL_NO_UI is currently retained */
 # include <openssl/uierr.h>
 
 /* For compatibility reasons, the macro OPENSSL_NO_UI is currently retained */

-# if OPENSSL_API_COMPAT < 0x10200000L
+# if OPENSSL_API_COMPAT < 0x30000000L

 #  ifdef OPENSSL_NO_UI_CONSOLE
 #   define OPENSSL_NO_UI
 #  endif
 #  ifdef OPENSSL_NO_UI_CONSOLE
 #   define OPENSSL_NO_UI
 #  endif

diff --git a/test/asn1_decode_test.c b/test/asn1_decode_test.c
index 369023d5f1110f965d508a26a156e32334e76a29..b48b9b57bce2ffbbb24a76ac572772d02ffb5082 100644 (file)
--- a/test/asn1_decode_test.c
+++ b/test/asn1_decode_test.c
@@ -28,7 +28,7 @@ static unsigned char t_invalid_zero[] = {
     0x02, 0x00                   /* INTEGER tag + length */
 };
 
     0x02, 0x00                   /* INTEGER tag + length */
 };
 

-#if OPENSSL_API_COMPAT < 0x10200000L
+#if OPENSSL_API_COMPAT < 0x30000000L

 /* LONG case ************************************************************* */
 
 typedef struct {
 /* LONG case ************************************************************* */
 
 typedef struct {


@@ -162,7 +162,7 @@ static int test_uint64(void)
 
 int setup_tests(void)
 {
 
 int setup_tests(void)
 {

-#if OPENSSL_API_COMPAT < 0x10200000L
+#if OPENSSL_API_COMPAT < 0x30000000L

     ADD_TEST(test_long);
 #endif
     ADD_TEST(test_int32);
     ADD_TEST(test_long);
 #endif
     ADD_TEST(test_int32);

diff --git a/test/asn1_encode_test.c b/test/asn1_encode_test.c
index 6a64bf904b16385f979a5ed41b7539aa71f6ea5b..4c4820e5928bd528bc9592f822e5f59b6c9d4dc6 100644 (file)
--- a/test/asn1_encode_test.c
+++ b/test/asn1_encode_test.c
@@ -179,7 +179,7 @@ typedef struct {
     ENCDEC_DATA(-1, -1),                        \
     ENCDEC_DATA(0, ASN1_LONG_UNDEF)
 
     ENCDEC_DATA(-1, -1),                        \
     ENCDEC_DATA(0, ASN1_LONG_UNDEF)
 

-#if OPENSSL_API_COMPAT < 0x10200000L
+#if OPENSSL_API_COMPAT < 0x30000000L

 /***** LONG ******************************************************************/
 
 typedef struct {
 /***** LONG ******************************************************************/
 
 typedef struct {


@@ -824,7 +824,7 @@ static int test_intern(const TEST_PACKAGE *package)
     return fail == 0;
 }
 
     return fail == 0;
 }
 

-#if OPENSSL_API_COMPAT < 0x10200000L
+#if OPENSSL_API_COMPAT < 0x30000000L

 static int test_long_32bit(void)
 {
     return test_intern(&long_test_package_32bit);
 static int test_long_32bit(void)
 {
     return test_intern(&long_test_package_32bit);


@@ -858,7 +858,7 @@ static int test_uint64(void)
 
 int setup_tests(void)
 {
 
 int setup_tests(void)
 {

-#if OPENSSL_API_COMPAT < 0x10200000L
+#if OPENSSL_API_COMPAT < 0x30000000L

     ADD_TEST(test_long_32bit);
     ADD_TEST(test_long_64bit);
 #endif
     ADD_TEST(test_long_32bit);
     ADD_TEST(test_long_64bit);
 #endif

diff --git a/util/libcrypto.num b/util/libcrypto.num
index f7d6cb5823fb6faeac54efff77c8390aafcd3b8f..85a15a04807a6840fa3f04deb6e3af463c415bf4 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -261,7 +261,7 @@ ASN1_NULL_free                          262 1_1_0   EXIST::FUNCTION:
 EC_KEY_copy                             263    1_1_0   EXIST::FUNCTION:EC
 EVP_des_ede3                            264    1_1_0   EXIST::FUNCTION:DES
 PKCS7_add1_attrib_digest                265    1_1_0   EXIST::FUNCTION:
 EC_KEY_copy                             263    1_1_0   EXIST::FUNCTION:EC
 EVP_des_ede3                            264    1_1_0   EXIST::FUNCTION:DES
 PKCS7_add1_attrib_digest                265    1_1_0   EXIST::FUNCTION:

-EC_POINT_get_affine_coordinates_GFp     266    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_2_0,EC
+EC_POINT_get_affine_coordinates_GFp     266    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC

 EVP_seed_ecb                            267    1_1_0   EXIST::FUNCTION:SEED
 BIO_dgram_sctp_wait_for_dry             268    1_1_0   EXIST::FUNCTION:DGRAM,SCTP
 ASN1_OCTET_STRING_NDEF_it               269    1_1_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 EVP_seed_ecb                            267    1_1_0   EXIST::FUNCTION:SEED
 BIO_dgram_sctp_wait_for_dry             268    1_1_0   EXIST::FUNCTION:DGRAM,SCTP
 ASN1_OCTET_STRING_NDEF_it               269    1_1_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:


@@ -285,7 +285,7 @@ X509V3_EXT_get_nid                      285 1_1_0   EXIST::FUNCTION:
 BIO_s_log                               286    1_1_0   EXIST::FUNCTION:
 EC_POINT_set_to_infinity                287    1_1_0   EXIST::FUNCTION:EC
 EVP_des_ede_ofb                         288    1_1_0   EXIST::FUNCTION:DES
 BIO_s_log                               286    1_1_0   EXIST::FUNCTION:
 EC_POINT_set_to_infinity                287    1_1_0   EXIST::FUNCTION:EC
 EVP_des_ede_ofb                         288    1_1_0   EXIST::FUNCTION:DES

-ECDH_KDF_X9_62                          289    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_2_0,EC
+ECDH_KDF_X9_62                          289    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC

 ASN1_UNIVERSALSTRING_to_string          290    1_1_0   EXIST::FUNCTION:
 CRYPTO_gcm128_setiv                     291    1_1_0   EXIST::FUNCTION:
 ASN1_PCTX_set_oid_flags                 292    1_1_0   EXIST::FUNCTION:
 ASN1_UNIVERSALSTRING_to_string          290    1_1_0   EXIST::FUNCTION:
 CRYPTO_gcm128_setiv                     291    1_1_0   EXIST::FUNCTION:
 ASN1_PCTX_set_oid_flags                 292    1_1_0   EXIST::FUNCTION:


@@ -544,7 +544,7 @@ CONF_get_number                         544 1_1_0   EXIST::FUNCTION:
 X509_EXTENSION_get_object               545    1_1_0   EXIST::FUNCTION:
 X509_EXTENSIONS_it                      546    1_1_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_EXTENSIONS_it                      546    1_1_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 X509_EXTENSION_get_object               545    1_1_0   EXIST::FUNCTION:
 X509_EXTENSIONS_it                      546    1_1_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_EXTENSIONS_it                      546    1_1_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:

-EC_POINT_set_compressed_coordinates_GF2m 547   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_2_0,EC,EC2M
+EC_POINT_set_compressed_coordinates_GF2m 547   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC,EC2M

 RSA_sign_ASN1_OCTET_STRING              548    1_1_0   EXIST::FUNCTION:RSA
 d2i_X509_CRL_fp                         549    1_1_0   EXIST::FUNCTION:STDIO
 i2d_RSA_PUBKEY                          550    1_1_0   EXIST::FUNCTION:RSA
 RSA_sign_ASN1_OCTET_STRING              548    1_1_0   EXIST::FUNCTION:RSA
 d2i_X509_CRL_fp                         549    1_1_0   EXIST::FUNCTION:STDIO
 i2d_RSA_PUBKEY                          550    1_1_0   EXIST::FUNCTION:RSA


@@ -638,7 +638,7 @@ X509_REVOKED_it                         638 1_1_0   EXIST:!EXPORT_VAR_AS_FUNCTION:
 X509_REVOKED_it                         638    1_1_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 CRYPTO_THREAD_write_lock                639    1_1_0   EXIST::FUNCTION:
 X509V3_NAME_from_section                640    1_1_0   EXIST::FUNCTION:
 X509_REVOKED_it                         638    1_1_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
 CRYPTO_THREAD_write_lock                639    1_1_0   EXIST::FUNCTION:
 X509V3_NAME_from_section                640    1_1_0   EXIST::FUNCTION:

-EC_POINT_set_compressed_coordinates_GFp 641    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_2_0,EC
+EC_POINT_set_compressed_coordinates_GFp 641    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC

 OCSP_SINGLERESP_get0_id                 642    1_1_0   EXIST::FUNCTION:OCSP
 UI_add_info_string                      643    1_1_0   EXIST::FUNCTION:
 OBJ_NAME_remove                         644    1_1_0   EXIST::FUNCTION:
 OCSP_SINGLERESP_get0_id                 642    1_1_0   EXIST::FUNCTION:OCSP
 UI_add_info_string                      643    1_1_0   EXIST::FUNCTION:
 OBJ_NAME_remove                         644    1_1_0   EXIST::FUNCTION:


@@ -728,7 +728,7 @@ BIO_snprintf                            726 1_1_0   EXIST::FUNCTION:
 EC_POINT_hex2point                      727    1_1_0   EXIST::FUNCTION:EC
 X509v3_get_ext_by_critical              728    1_1_0   EXIST::FUNCTION:
 ENGINE_get_default_RSA                  729    1_1_0   EXIST::FUNCTION:ENGINE
 EC_POINT_hex2point                      727    1_1_0   EXIST::FUNCTION:EC
 X509v3_get_ext_by_critical              728    1_1_0   EXIST::FUNCTION:
 ENGINE_get_default_RSA                  729    1_1_0   EXIST::FUNCTION:ENGINE

-DSA_sign_setup                          730    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_2_0,DSA
+DSA_sign_setup                          730    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_3,DSA

 OPENSSL_sk_new_null                     731    1_1_0   EXIST::FUNCTION:
 PEM_read_PKCS8                          732    1_1_0   EXIST::FUNCTION:STDIO
 BN_mod_sqr                              733    1_1_0   EXIST::FUNCTION:
 OPENSSL_sk_new_null                     731    1_1_0   EXIST::FUNCTION:
 PEM_read_PKCS8                          732    1_1_0   EXIST::FUNCTION:STDIO
 BN_mod_sqr                              733    1_1_0   EXIST::FUNCTION:


@@ -1768,8 +1768,8 @@ ASYNC_init_thread                       1755      1_1_0   EXIST::FUNCTION:
 OCSP_BASICRESP_get_ext_by_OBJ           1756   1_1_0   EXIST::FUNCTION:OCSP
 X509_reject_clear                       1757   1_1_0   EXIST::FUNCTION:
 DH_security_bits                        1758   1_1_0   EXIST::FUNCTION:DH
 OCSP_BASICRESP_get_ext_by_OBJ           1756   1_1_0   EXIST::FUNCTION:OCSP
 X509_reject_clear                       1757   1_1_0   EXIST::FUNCTION:
 DH_security_bits                        1758   1_1_0   EXIST::FUNCTION:DH

-LONG_it                                 1759   1_1_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DEPRECATEDIN_1_2_0
-LONG_it                                 1759   1_1_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DEPRECATEDIN_1_2_0
+LONG_it                                 1759   1_1_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DEPRECATEDIN_3
+LONG_it                                 1759   1_1_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DEPRECATEDIN_3

 ASN1_dup                                1760   1_1_0   EXIST::FUNCTION:
 TS_RESP_new                             1761   1_1_0   EXIST::FUNCTION:TS
 i2d_PKCS8PrivateKeyInfo_fp              1762   1_1_0   EXIST::FUNCTION:STDIO
 ASN1_dup                                1760   1_1_0   EXIST::FUNCTION:
 TS_RESP_new                             1761   1_1_0   EXIST::FUNCTION:TS
 i2d_PKCS8PrivateKeyInfo_fp              1762   1_1_0   EXIST::FUNCTION:STDIO


@@ -1834,8 +1834,8 @@ X509V3_EXT_add_list                     1821      1_1_0   EXIST::FUNCTION:
 CMS_compress                            1822   1_1_0   EXIST::FUNCTION:CMS
 X509_get_ext_by_critical                1823   1_1_0   EXIST::FUNCTION:
 ASYNC_WAIT_CTX_clear_fd                 1824   1_1_0   EXIST::FUNCTION:
 CMS_compress                            1822   1_1_0   EXIST::FUNCTION:CMS
 X509_get_ext_by_critical                1823   1_1_0   EXIST::FUNCTION:
 ASYNC_WAIT_CTX_clear_fd                 1824   1_1_0   EXIST::FUNCTION:

-ZLONG_it                                1825   1_1_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DEPRECATEDIN_1_2_0
-ZLONG_it                                1825   1_1_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DEPRECATEDIN_1_2_0
+ZLONG_it                                1825   1_1_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:DEPRECATEDIN_3
+ZLONG_it                                1825   1_1_0   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:DEPRECATEDIN_3

 OPENSSL_sk_find_ex                      1826   1_1_0   EXIST::FUNCTION:
 ASN1_ENUMERATED_to_BN                   1827   1_1_0   EXIST::FUNCTION:
 X509_CRL_get_ext_d2i                    1828   1_1_0   EXIST::FUNCTION:
 OPENSSL_sk_find_ex                      1826   1_1_0   EXIST::FUNCTION:
 ASN1_ENUMERATED_to_BN                   1827   1_1_0   EXIST::FUNCTION:
 X509_CRL_get_ext_d2i                    1828   1_1_0   EXIST::FUNCTION:


@@ -1874,7 +1874,7 @@ i2b_PrivateKey_bio                      1858      1_1_0   EXIST::FUNCTION:DSA
 ASN1_STRING_length_set                  1859   1_1_0   EXIST::FUNCTION:
 PEM_write_PKCS8                         1860   1_1_0   EXIST::FUNCTION:STDIO
 PKCS7_digest_from_attributes            1861   1_1_0   EXIST::FUNCTION:
 ASN1_STRING_length_set                  1859   1_1_0   EXIST::FUNCTION:
 PEM_write_PKCS8                         1860   1_1_0   EXIST::FUNCTION:STDIO
 PKCS7_digest_from_attributes            1861   1_1_0   EXIST::FUNCTION:

-EC_GROUP_set_curve_GFp                  1862   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_2_0,EC
+EC_GROUP_set_curve_GFp                  1862   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC

 X509_PURPOSE_get0                       1863   1_1_0   EXIST::FUNCTION:
 EVP_PKEY_set1_DSA                       1864   1_1_0   EXIST::FUNCTION:DSA
 X509_NAME_it                            1865   1_1_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 X509_PURPOSE_get0                       1863   1_1_0   EXIST::FUNCTION:
 EVP_PKEY_set1_DSA                       1864   1_1_0   EXIST::FUNCTION:DSA
 X509_NAME_it                            1865   1_1_0   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:


@@ -1982,7 +1982,7 @@ X509_CRL_it                             1966      1_1_0   EXIST:EXPORT_VAR_AS_FUNCTION:
 d2i_X509_ALGOR                          1967   1_1_0   EXIST::FUNCTION:
 PKCS12_PBE_keyivgen                     1968   1_1_0   EXIST::FUNCTION:
 BIO_test_flags                          1969   1_1_0   EXIST::FUNCTION:
 d2i_X509_ALGOR                          1967   1_1_0   EXIST::FUNCTION:
 PKCS12_PBE_keyivgen                     1968   1_1_0   EXIST::FUNCTION:
 BIO_test_flags                          1969   1_1_0   EXIST::FUNCTION:

-EC_POINT_get_affine_coordinates_GF2m    1970   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_2_0,EC,EC2M
+EC_POINT_get_affine_coordinates_GF2m    1970   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC,EC2M

 EVP_ENCODE_CTX_num                      1971   1_1_0   EXIST::FUNCTION:
 Camellia_cfb1_encrypt                   1972   1_1_0   EXIST::FUNCTION:CAMELLIA
 NCONF_load_fp                           1973   1_1_0   EXIST::FUNCTION:STDIO
 EVP_ENCODE_CTX_num                      1971   1_1_0   EXIST::FUNCTION:
 Camellia_cfb1_encrypt                   1972   1_1_0   EXIST::FUNCTION:CAMELLIA
 NCONF_load_fp                           1973   1_1_0   EXIST::FUNCTION:STDIO


@@ -2183,7 +2183,7 @@ i2d_ASN1_T61STRING                      2156      1_1_0   EXIST::FUNCTION:
 X509_add1_trust_object                  2157   1_1_0   EXIST::FUNCTION:
 PEM_write_X509                          2158   1_1_0   EXIST::FUNCTION:STDIO
 BN_CTX_free                             2159   1_1_0   EXIST::FUNCTION:
 X509_add1_trust_object                  2157   1_1_0   EXIST::FUNCTION:
 PEM_write_X509                          2158   1_1_0   EXIST::FUNCTION:STDIO
 BN_CTX_free                             2159   1_1_0   EXIST::FUNCTION:

-EC_GROUP_get_curve_GF2m                 2160   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_2_0,EC,EC2M
+EC_GROUP_get_curve_GF2m                 2160   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC,EC2M

 EVP_MD_flags                            2161   1_1_0   EXIST::FUNCTION:
 OPENSSL_sk_set                          2162   1_1_0   EXIST::FUNCTION:
 OCSP_request_sign                       2163   1_1_0   EXIST::FUNCTION:OCSP
 EVP_MD_flags                            2161   1_1_0   EXIST::FUNCTION:
 OPENSSL_sk_set                          2162   1_1_0   EXIST::FUNCTION:
 OCSP_request_sign                       2163   1_1_0   EXIST::FUNCTION:OCSP


@@ -2263,7 +2263,7 @@ ENGINE_set_name                         2235      1_1_0   EXIST::FUNCTION:ENGINE
 TS_TST_INFO_get_policy_id               2236   1_1_0   EXIST::FUNCTION:TS
 PKCS7_SIGNER_INFO_set                   2237   1_1_0   EXIST::FUNCTION:
 PEM_write_bio_PKCS8_PRIV_KEY_INFO       2238   1_1_0   EXIST::FUNCTION:
 TS_TST_INFO_get_policy_id               2236   1_1_0   EXIST::FUNCTION:TS
 PKCS7_SIGNER_INFO_set                   2237   1_1_0   EXIST::FUNCTION:
 PEM_write_bio_PKCS8_PRIV_KEY_INFO       2238   1_1_0   EXIST::FUNCTION:

-EC_GROUP_set_curve_GF2m                 2239   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_2_0,EC,EC2M
+EC_GROUP_set_curve_GF2m                 2239   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC,EC2M

 ENGINE_load_builtin_engines             2240   1_1_0   EXIST::FUNCTION:ENGINE
 SRP_VBASE_init                          2241   1_1_0   EXIST::FUNCTION:SRP
 SHA224_Final                            2242   1_1_0   EXIST::FUNCTION:
 ENGINE_load_builtin_engines             2240   1_1_0   EXIST::FUNCTION:ENGINE
 SRP_VBASE_init                          2241   1_1_0   EXIST::FUNCTION:SRP
 SHA224_Final                            2242   1_1_0   EXIST::FUNCTION:


@@ -2983,7 +2983,7 @@ EVP_aes_192_cbc                         2936      1_1_0   EXIST::FUNCTION:
 PKCS8_pkey_set0                         2937   1_1_0   EXIST::FUNCTION:
 X509_get1_email                         2938   1_1_0   EXIST::FUNCTION:
 EC_POINT_point2oct                      2939   1_1_0   EXIST::FUNCTION:EC
 PKCS8_pkey_set0                         2937   1_1_0   EXIST::FUNCTION:
 X509_get1_email                         2938   1_1_0   EXIST::FUNCTION:
 EC_POINT_point2oct                      2939   1_1_0   EXIST::FUNCTION:EC

-EC_GROUP_get_curve_GFp                  2940   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_2_0,EC
+EC_GROUP_get_curve_GFp                  2940   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC

 ASYNC_block_pause                       2941   1_1_0   EXIST::FUNCTION:
 OCSP_SINGLERESP_get_ext                 2942   1_1_0   EXIST::FUNCTION:OCSP
 CRYPTO_strdup                           2943   1_1_0   EXIST::FUNCTION:
 ASYNC_block_pause                       2941   1_1_0   EXIST::FUNCTION:
 OCSP_SINGLERESP_get_ext                 2942   1_1_0   EXIST::FUNCTION:OCSP
 CRYPTO_strdup                           2943   1_1_0   EXIST::FUNCTION:


@@ -3234,7 +3234,7 @@ X509_NAME_oneline                       3186      1_1_0   EXIST::FUNCTION:
 X509V3_set_nconf                        3187   1_1_0   EXIST::FUNCTION:
 RSAPrivateKey_dup                       3188   1_1_0   EXIST::FUNCTION:RSA
 BN_mod_add                              3189   1_1_0   EXIST::FUNCTION:
 X509V3_set_nconf                        3187   1_1_0   EXIST::FUNCTION:
 RSAPrivateKey_dup                       3188   1_1_0   EXIST::FUNCTION:RSA
 BN_mod_add                              3189   1_1_0   EXIST::FUNCTION:

-EC_POINT_set_affine_coordinates_GFp     3190   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_2_0,EC
+EC_POINT_set_affine_coordinates_GFp     3190   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC

 X509_get_default_cert_file              3191   1_1_0   EXIST::FUNCTION:
 UI_method_set_flusher                   3192   1_1_0   EXIST::FUNCTION:
 RSA_new_method                          3193   1_1_0   EXIST::FUNCTION:RSA
 X509_get_default_cert_file              3191   1_1_0   EXIST::FUNCTION:
 UI_method_set_flusher                   3192   1_1_0   EXIST::FUNCTION:
 RSA_new_method                          3193   1_1_0   EXIST::FUNCTION:RSA


@@ -3572,7 +3572,7 @@ PROXY_CERT_INFO_EXTENSION_new           3523      1_1_0   EXIST::FUNCTION:
 EVP_bf_cbc                              3524   1_1_0   EXIST::FUNCTION:BF
 DSA_do_verify                           3525   1_1_0   EXIST::FUNCTION:DSA
 EC_GROUP_get_seed_len                   3526   1_1_0   EXIST::FUNCTION:EC
 EVP_bf_cbc                              3524   1_1_0   EXIST::FUNCTION:BF
 DSA_do_verify                           3525   1_1_0   EXIST::FUNCTION:DSA
 EC_GROUP_get_seed_len                   3526   1_1_0   EXIST::FUNCTION:EC

-EC_POINT_set_affine_coordinates_GF2m    3527   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_2_0,EC,EC2M
+EC_POINT_set_affine_coordinates_GF2m    3527   1_1_0   EXIST::FUNCTION:DEPRECATEDIN_3,EC,EC2M

 TS_REQ_set_policy_id                    3528   1_1_0   EXIST::FUNCTION:TS
 BIO_callback_ctrl                       3529   1_1_0   EXIST::FUNCTION:
 v2i_GENERAL_NAME                        3530   1_1_0   EXIST::FUNCTION:
 TS_REQ_set_policy_id                    3528   1_1_0   EXIST::FUNCTION:TS
 BIO_callback_ctrl                       3529   1_1_0   EXIST::FUNCTION:
 v2i_GENERAL_NAME                        3530   1_1_0   EXIST::FUNCTION: