Remove the last of BIO_print_errors.
The naming breaks layering, but it seems we're stuck with it. We don't
seem to have bothered making first-party code call it BIO_print_errors
(I found no callers of BIO_print_errors), so let's just leave it at
ERR_print_errors.
Change-Id: Iddc22a6afc2c61d4b94ac555be95079e0f477171
Reviewed-on: https://boringssl-review.googlesource.com/11960
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/crypto/bio/bio.c b/crypto/bio/bio.c
index 52475f9..675e903 100644
--- a/crypto/bio/bio.c
+++ b/crypto/bio/bio.c
@@ -460,12 +460,8 @@
return BIO_write((BIO *)bio, str, len);
}
-void BIO_print_errors(BIO *bio) {
- ERR_print_errors_cb(print_bio, bio);
-}
-
void ERR_print_errors(BIO *bio) {
- BIO_print_errors(bio);
+ ERR_print_errors_cb(print_bio, bio);
}
/* bio_read_all reads everything from |bio| and prepends |prefix| to it. On
diff --git a/crypto/x509/t_x509.c b/crypto/x509/t_x509.c
index 1fba9b4..d5d48ba 100644
--- a/crypto/x509/t_x509.c
+++ b/crypto/x509/t_x509.c
@@ -207,7 +207,7 @@
pkey = X509_get_pubkey(x);
if (pkey == NULL) {
BIO_printf(bp, "%12sUnable to load Public Key\n", "");
- BIO_print_errors(bp);
+ ERR_print_errors(bp);
} else {
EVP_PKEY_print_public(bp, pkey, 16, NULL);
EVP_PKEY_free(pkey);
diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 18f9f2a..3c8b97d 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -333,9 +333,9 @@
OPENSSL_EXPORT int BIO_hexdump(BIO *bio, const uint8_t *data, size_t len,
unsigned indent);
-/* BIO_print_errors prints the current contents of the error stack to |bio|
+/* ERR_print_errors prints the current contents of the error stack to |bio|
* using human readable strings where possible. */
-OPENSSL_EXPORT void BIO_print_errors(BIO *bio);
+OPENSSL_EXPORT void ERR_print_errors(BIO *bio);
/* BIO_read_asn1 reads a single ASN.1 object from |bio|. If successful it sets
* |*out| to be an allocated buffer (that should be freed with |OPENSSL_free|),
@@ -748,9 +748,6 @@
* on one line. */
OPENSSL_EXPORT const BIO_METHOD *BIO_f_base64(void);
-/* ERR_print_errors is an alias for |BIO_print_errors|. */
-OPENSSL_EXPORT void ERR_print_errors(BIO *bio);
-
/* Private functions */
