Deprecate no-op startup/shutdown ERR functions
Functions like this are usually in the deprecated section. This was
probably early enough that we hadn't actually set this convention.
(This is deprecated in the sense of "don't call this, it's pointless",
not "we actively plan to remove it". To that end, remove the TODO to
remove ERR_load_BIO_strings. Quite a lot more than libjingle calls it,
so I doubt we will ever do away with it.)
Change-Id: Ia13fede6a4b7e25ae37072866acf773c5098989c
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/84387
Reviewed-by: Lily Chen <chlily@google.com>
Commit-Queue: Lily Chen <chlily@google.com>
Auto-Submit: David Benjamin <davidben@google.com>
diff --git a/include/openssl/err.h b/include/openssl/err.h
index ee19f70..c7923fe 100644
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -45,26 +45,6 @@
// backtrace of sorts.
-// Startup and shutdown.
-
-// ERR_load_BIO_strings does nothing.
-//
-// TODO(fork): remove. libjingle calls this.
-OPENSSL_EXPORT void ERR_load_BIO_strings(void);
-
-// ERR_load_ERR_strings does nothing.
-OPENSSL_EXPORT void ERR_load_ERR_strings(void);
-
-// ERR_load_crypto_strings does nothing.
-OPENSSL_EXPORT void ERR_load_crypto_strings(void);
-
-// ERR_load_RAND_strings does nothing.
-OPENSSL_EXPORT void ERR_load_RAND_strings(void);
-
-// ERR_free_strings does nothing.
-OPENSSL_EXPORT void ERR_free_strings(void);
-
-
// Reading and formatting errors.
// ERR_GET_LIB returns the library code for the error. This is one of
@@ -317,6 +297,21 @@
// Deprecated functions.
+// ERR_load_BIO_strings does nothing.
+OPENSSL_EXPORT void ERR_load_BIO_strings(void);
+
+// ERR_load_ERR_strings does nothing.
+OPENSSL_EXPORT void ERR_load_ERR_strings(void);
+
+// ERR_load_crypto_strings does nothing.
+OPENSSL_EXPORT void ERR_load_crypto_strings(void);
+
+// ERR_load_RAND_strings does nothing.
+OPENSSL_EXPORT void ERR_load_RAND_strings(void);
+
+// ERR_free_strings does nothing.
+OPENSSL_EXPORT void ERR_free_strings(void);
+
// ERR_remove_state calls |ERR_clear_error|.
OPENSSL_EXPORT void ERR_remove_state(unsigned long pid);
