From 18ca5f23f7f2025708f8e84e2401dc9d895f80d5 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 30 Jul 2003 19:33:49 +0000
Subject: [PATCH] clear errors in all cases before reading certificates

---
 panda/src/downloader/httpClient.cxx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/panda/src/downloader/httpClient.cxx b/panda/src/downloader/httpClient.cxx
index 9a0874bfa2..dc1821bec8 100644
--- a/panda/src/downloader/httpClient.cxx
+++ b/panda/src/downloader/httpClient.cxx
@@ -30,9 +30,7 @@
 #ifdef HAVE_SSL
 
 #include <openssl/rand.h>
-#ifdef REPORT_OPENSSL_ERRORS
 #include <openssl/err.h>
-#endif
 
 // Windows may define this macro inappropriately.
 #ifdef X509_NAME
@@ -1190,9 +1188,7 @@ load_verify_locations(SSL_CTX *ctx, const Filename &ca_file) {
 
   // We have to be sure and clear the OpenSSL error state before we
   // call this function, or it will get confused.
-#ifdef REPORT_OPENSSL_ERRORS
   ERR_clear_error();
-#endif
   inf = PEM_X509_INFO_read_bio(mbio, NULL, NULL, NULL);
   BIO_free(mbio);