diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-01-12 12:34:19 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-01-12 12:34:19 -0500 |
| commit | 47257bb010ef91ddd43a822738d529d5437c83df (patch) | |
| tree | 3b89672c266f6830a2b6ba873f3467a87e8b087f | |
| parent | 6d647df714c324e5504310de2bab394b53f71bb9 (diff) | |
remove warnings for bad certificates (too scary), add info
for the rejected count
| -rw-r--r-- | indra/newview/llsechandler_basic.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp index ffb9aa1585..814cfde75d 100644 --- a/indra/newview/llsechandler_basic.cpp +++ b/indra/newview/llsechandler_basic.cpp @@ -574,6 +574,7 @@ LLBasicCertificateStore::LLBasicCertificateStore(const std::string& filename) void LLBasicCertificateStore::load_from_file(const std::string& filename) { int loaded = 0; + int rejected = 0; // scan the PEM file extracting each certificate if (LLFile::isfile(filename)) @@ -606,11 +607,13 @@ void LLBasicCertificateStore::load_from_file(const std::string& filename) catch (LLCertException& cert_exception) { LLSD cert_info(cert_exception.getCertData()); - LL_WARNS("SECAPI") << "invalid certificate (" << cert_exception.what() << "): " << cert_info << LL_ENDL; + LL_DEBUGS("SECAPI_BADCERT","SECAPI") << "invalid certificate (" << cert_exception.what() << "): " << cert_info << LL_ENDL; + rejected++; } catch (...) { LOG_UNHANDLED_EXCEPTION("creating certificate from the certificate store file"); + rejected++; } X509_free(cert_x509); cert_x509 = NULL; @@ -622,7 +625,7 @@ void LLBasicCertificateStore::load_from_file(const std::string& filename) LL_WARNS("SECAPI") << "BIO read failed for " << filename << LL_ENDL; } - LL_INFOS("SECAPI") << "loaded " << loaded << " certificates from " << filename << LL_ENDL; + LL_INFOS("SECAPI") << "loaded " << loaded << " good certificates (rejected " << rejected << ") from " << filename << LL_ENDL; } else { |