Deprecate ERR_get_state()

Internally, we still need this function, so we make it internal and
then add a new ERR_get_state() that simply calls the internal variant,
unless it's "removed" by configuration.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9462)

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 25426be730911b22b23ca7e0cfe9aea5cb057ff5..51115fd00ae94f588b06275fbdcb12e35da44524 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -365,7 +365,7 @@ void ERR_clear_error(void)
     int i;
     ERR_STATE *es;
 
-    es = ERR_get_state();
+    es = err_get_state_int();
     if (es == NULL)
         return;
 
@@ -488,7 +488,7 @@ static unsigned long get_error_values(int inc, int top, const char **file,
     ERR_STATE *es;
     unsigned long ret;
 
-    es = ERR_get_state();
+    es = err_get_state_int();
     if (es == NULL)
         return 0;
 
@@ -685,7 +685,7 @@ DEFINE_RUN_ONCE_STATIC(err_do_init)
     return CRYPTO_THREAD_init_local(&err_thread_local, NULL);
 }
 
-ERR_STATE *ERR_get_state(void)
+ERR_STATE *err_get_state_int(void)
 {
     ERR_STATE *state;
     int saveerrno = get_last_sys_error();
@@ -724,6 +724,14 @@ ERR_STATE *ERR_get_state(void)
     return state;
 }
 
+#if !OPENSSL_API_3
+ERR_STATE *ERR_get_state(void)
+{
+    return err_get_state_int();
+}
+#endif
+
+
 /*
  * err_shelve_state returns the current thread local error state
  * and freezes the error module until err_unshelve_state is called.
@@ -786,7 +794,7 @@ static int err_set_error_data_int(char *data, size_t size, int flags,
 {
     ERR_STATE *es;
 
-    es = ERR_get_state();
+    es = err_get_state_int();
     if (es == NULL)
         return 0;
 
@@ -831,7 +839,7 @@ void ERR_add_error_vdata(int num, va_list args)
     ERR_STATE *es;
 
     /* Get the current error data; if an allocated string get it. */
-    es = ERR_get_state();
+    es = err_get_state_int();
     if (es == NULL)
         return;
     i = es->top;
@@ -886,7 +894,7 @@ int ERR_set_mark(void)
 {
     ERR_STATE *es;
 
-    es = ERR_get_state();
+    es = err_get_state_int();
     if (es == NULL)
         return 0;
 
@@ -900,7 +908,7 @@ int ERR_pop_to_mark(void)
 {
     ERR_STATE *es;
 
-    es = ERR_get_state();
+    es = err_get_state_int();
     if (es == NULL)
         return 0;
 
@@ -921,7 +929,7 @@ int ERR_clear_last_mark(void)
     ERR_STATE *es;
     int top;
 
-    es = ERR_get_state();
+    es = err_get_state_int();
     if (es == NULL)
         return 0;
 
@@ -942,7 +950,7 @@ void err_clear_last_constant_time(int clear)
     ERR_STATE *es;
     int top;
 
-    es = ERR_get_state();
+    es = err_get_state_int();
     if (es == NULL)
         return;
 

diff --git a/crypto/err/err_blocks.c b/crypto/err/err_blocks.c
index c2ff7c08237762a8139a3e4301c581aa6b47ded1..e50f580b33e25f527aae068f12d2cf654fca22f4 100644 (file)
--- a/crypto/err/err_blocks.c
+++ b/crypto/err/err_blocks.c
@@ -18,7 +18,7 @@ void ERR_new(void)
 {
     ERR_STATE *es;
 
-    es = ERR_get_state();
+    es = err_get_state_int();
     if (es == NULL)
         return;
 
@@ -31,7 +31,7 @@ void ERR_set_debug(const char *file, int line, const char *func)
 {
     ERR_STATE *es;
 
-    es = ERR_get_state();
+    es = err_get_state_int();
     if (es == NULL)
         return;
 
@@ -55,7 +55,7 @@ void ERR_vset_error(int lib, int reason, const char *fmt, va_list args)
     unsigned long flags = 0;
     size_t i;
 
-    es = ERR_get_state();
+    es = err_get_state_int();
     if (es == NULL)
         return;
     i = es->top;

diff --git a/crypto/err/err_locl.h b/crypto/err/err_locl.h
index d45a00e7464618d54383a20c5545c30810b8fce3..0374bf6a6f856420861d5d22189171d81ab4f671 100644 (file)
--- a/crypto/err/err_locl.h
+++ b/crypto/err/err_locl.h
@@ -66,3 +66,5 @@ static ossl_inline void err_clear(ERR_STATE *es, size_t i, int deall)
     es->err_file[i] = NULL;
     es->err_line[i] = -1;
 }
+
+ERR_STATE *err_get_state_int(void);

diff --git a/fuzz/asn1.c b/fuzz/asn1.c
index 54cd0fcf826b2f02e891de83aba6187779427f23..4a5458af3e5605b68b8a8f84286e54c959df111c 100644 (file)
--- a/fuzz/asn1.c
+++ b/fuzz/asn1.c
@@ -283,7 +283,7 @@ int FuzzerInitialize(int *argc, char ***argv)
 
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
     OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
-    ERR_get_state();
+    ERR_clear_error();
     CRYPTO_free_ex_index(0, -1);
     FuzzerSetRand();
 

diff --git a/fuzz/asn1parse.c b/fuzz/asn1parse.c
index 8aab0d2f1c66ccbe900e032d2b3b1ee06768b282..ac888e535ae11dcc92a4170b2dbbed281d6153a4 100644 (file)
--- a/fuzz/asn1parse.c
+++ b/fuzz/asn1parse.c
@@ -25,7 +25,7 @@ int FuzzerInitialize(int *argc, char ***argv)
 {
     bio_out = BIO_new_file("/dev/null", "w");
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-    ERR_get_state();
+    ERR_clear_error();
     CRYPTO_free_ex_index(0, -1);
     return 1;
 }

diff --git a/fuzz/bignum.c b/fuzz/bignum.c
index 3de6a89846b69e3b97bc146ec1fb733fd8b0dc87..d7c3716aacb43b80e09a6e3e736383609c356ca1 100644 (file)
--- a/fuzz/bignum.c
+++ b/fuzz/bignum.c
@@ -22,7 +22,7 @@
 int FuzzerInitialize(int *argc, char ***argv)
 {
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-    ERR_get_state();
+    ERR_clear_error();
 
     return 1;
 }

diff --git a/fuzz/bndiv.c b/fuzz/bndiv.c
index 70636d4fee596718be013fb24f115ea471079494..d9467b5e8b412cceecd539e744e4adcfc9891791 100644 (file)
--- a/fuzz/bndiv.c
+++ b/fuzz/bndiv.c
@@ -38,7 +38,7 @@ int FuzzerInitialize(int *argc, char ***argv)
     ctx = BN_CTX_new();
 
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-    ERR_get_state();
+    ERR_clear_error();
 
     return 1;
 }

diff --git a/fuzz/client.c b/fuzz/client.c
index 5483c6a00bffcb0bd568fffcff8b3868cb70406c..451989773ad7b5c5a49984114adbb5c0f0b03b63 100644 (file)
--- a/fuzz/client.c
+++ b/fuzz/client.c
@@ -44,7 +44,7 @@ int FuzzerInitialize(int *argc, char ***argv)
 
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_ASYNC, NULL);
     OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
-    ERR_get_state();
+    ERR_clear_error();
     CRYPTO_free_ex_index(0, -1);
     idx = SSL_get_ex_data_X509_STORE_CTX_idx();
     FuzzerSetRand();

diff --git a/fuzz/cms.c b/fuzz/cms.c
index 479ce02e0315fac6ece0f28c580f5a9be38c00fa..d464429a540792d4e6068bb0db8d15472b46e590 100644 (file)
--- a/fuzz/cms.c
+++ b/fuzz/cms.c
@@ -20,7 +20,7 @@
 int FuzzerInitialize(int *argc, char ***argv)
 {
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-    ERR_get_state();
+    ERR_clear_error();
     CRYPTO_free_ex_index(0, -1);
     return 1;
 }

diff --git a/fuzz/conf.c b/fuzz/conf.c
index 0739080f0f521e53b9f235f50c421719fe097297..72e4b358fd86f79547afd8d1f2f45e4184cc6bb5 100644 (file)
--- a/fuzz/conf.c
+++ b/fuzz/conf.c
@@ -19,7 +19,7 @@
 int FuzzerInitialize(int *argc, char ***argv)
 {
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-    ERR_get_state();
+    ERR_clear_error();
     return 1;
 }
 

diff --git a/fuzz/crl.c b/fuzz/crl.c
index e174180c9ee79e195e5705382dab137e9e107b1e..9e18dcb94b36337ba977d87b2b9d253d8925f2de 100644 (file)
--- a/fuzz/crl.c
+++ b/fuzz/crl.c
@@ -16,7 +16,7 @@
 int FuzzerInitialize(int *argc, char ***argv)
 {
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-    ERR_get_state();
+    ERR_clear_error();
     CRYPTO_free_ex_index(0, -1);
     return 1;
 }

diff --git a/fuzz/ct.c b/fuzz/ct.c
index a735fff85e2bf090493785c4b6910dda0e935d2f..b37b11039c0b99968283d8568b08e4bfe9c21342 100644 (file)
--- a/fuzz/ct.c
+++ b/fuzz/ct.c
@@ -21,7 +21,7 @@ int FuzzerInitialize(int *argc, char ***argv)
 {
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
     CRYPTO_free_ex_index(0, -1);
-    ERR_get_state();
+    ERR_clear_error();
     return 1;
 }
 

diff --git a/fuzz/server.c b/fuzz/server.c
index 953da48f5bea4796b0b0580b0e318fa4e7cdee0a..335f1f165df51937c55b1608f20ab3bb1af6414b 100644 (file)
--- a/fuzz/server.c
+++ b/fuzz/server.c
@@ -491,7 +491,7 @@ int FuzzerInitialize(int *argc, char ***argv)
 
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_ASYNC, NULL);
     OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
-    ERR_get_state();
+    ERR_clear_error();
     CRYPTO_free_ex_index(0, -1);
     idx = SSL_get_ex_data_X509_STORE_CTX_idx();
     FuzzerSetRand();

diff --git a/fuzz/x509.c b/fuzz/x509.c
index 3dbeb236e339925a4325b6fc4689d370388dafa7..858ad61bbfa754cee2dc6260a7f8932689e41b17 100644 (file)
--- a/fuzz/x509.c
+++ b/fuzz/x509.c
@@ -19,7 +19,7 @@
 int FuzzerInitialize(int *argc, char ***argv)
 {
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-    ERR_get_state();
+    ERR_clear_error();
     CRYPTO_free_ex_index(0, -1);
     FuzzerSetRand();
     return 1;

diff --git a/include/openssl/err.h b/include/openssl/err.h
index fc7326b7c9aa017d4d00e5caadc50a7a21fcc2cb..d7427898c8eea8663da79e85726c9132e3815fc3 100644 (file)
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -333,7 +333,7 @@ int ERR_load_ERR_strings(void);
 
 DEPRECATEDIN_1_1_0(void ERR_remove_thread_state(void *))
 DEPRECATEDIN_1_0_0(void ERR_remove_state(unsigned long pid))
-ERR_STATE *ERR_get_state(void);
+DEPRECATEDIN_3(ERR_STATE *ERR_get_state(void))
 
 int ERR_get_next_error_library(void);
 

diff --git a/util/libcrypto.num b/util/libcrypto.num
index cadc4a57baaa830aeffb0a1655ccf37bc0615a65..71e650e93347ab3b3be168027fc2c847568ebfd8 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -2213,7 +2213,7 @@ EVP_PKEY_missing_parameters             2261      3_0_0   EXIST::FUNCTION:
 X509_REQ_INFO_new                       2262   3_0_0   EXIST::FUNCTION:
 EVP_rc2_cfb64                           2263   3_0_0   EXIST::FUNCTION:RC2
 PKCS7_get_smimecap                      2264   3_0_0   EXIST::FUNCTION:
-ERR_get_state                           2265   3_0_0   EXIST::FUNCTION:
+ERR_get_state                           2265   3_0_0   EXIST::FUNCTION:DEPRECATEDIN_3
 d2i_DSAPrivateKey_bio                   2266   3_0_0   EXIST::FUNCTION:DSA
 X509_PURPOSE_get_trust                  2267   3_0_0   EXIST::FUNCTION:
 EC_GROUP_get_point_conversion_form      2268   3_0_0   EXIST::FUNCTION:EC