From d9c5e59e00dcbc2b842e1fa37da81aa5b592c712 Mon Sep 17 00:00:00 2001
From: Fred Gylys-Colwell <fredgc@google.com>
Date: Fri, 3 Aug 2018 12:18:34 -0700
Subject: [PATCH] Rename OpenSSL to BoringSSL

Merge from Widevine repo of http://go/wvgerrit/55620

There were two places that explicitly referenced BoringSSL instead of
OpenSSL. (Not counting, of course, all the BoringSSL functions and
headers that still have "OpenSSL" in their names.) This change fixes one
to mention either library and the other to specifically mention
BoringSSL.

Bug: 70636815
Test: CE CDM Unit Tests
Change-Id: I8703e1c427c66953fcc565a4f8f85093c7180f46
---
 libwvdrmengine/cdm/core/src/privacy_crypto_boringssl.cpp | 6 +++---
 libwvdrmengine/cdm/core/src/privacy_crypto_dummy.cpp     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libwvdrmengine/cdm/core/src/privacy_crypto_boringssl.cpp b/libwvdrmengine/cdm/core/src/privacy_crypto_boringssl.cpp
index 6f1b83f2..fa2e0739 100644
--- a/libwvdrmengine/cdm/core/src/privacy_crypto_boringssl.cpp
+++ b/libwvdrmengine/cdm/core/src/privacy_crypto_boringssl.cpp
@@ -189,9 +189,9 @@ bool RsaPublicKey::Encrypt(const std::string& clear_message,
   return true;
 }
 
-// LogOpenSSLError is a callback from OpenSSL which is called with each error
+// LogBoringSSLError is a callback from BoringSSL which is called with each error
 // in the thread's error queue.
-static int LogOpenSSLError(const char* msg, size_t /* len */, void* /* ctx */) {
+static int LogBoringSSLError(const char* msg, size_t /* len */, void* /* ctx */) {
   LOGE("  %s", msg);
   return 1;
 }
@@ -242,7 +242,7 @@ static bool VerifyPSSSignature(EVP_PKEY *pkey, const std::string &message,
   return true;
 
 err:
-  ERR_print_errors_cb(LogOpenSSLError, NULL);
+  ERR_print_errors_cb(LogBoringSSLError, NULL);
   EVP_MD_CTX_free(evp_md_ctx);
   return false;
 }
diff --git a/libwvdrmengine/cdm/core/src/privacy_crypto_dummy.cpp b/libwvdrmengine/cdm/core/src/privacy_crypto_dummy.cpp
index a70edbf0..ee40e879 100644
--- a/libwvdrmengine/cdm/core/src/privacy_crypto_dummy.cpp
+++ b/libwvdrmengine/cdm/core/src/privacy_crypto_dummy.cpp
@@ -4,7 +4,7 @@
 //
 // Description:
 //   Dummy version of privacy crypto classes for systems which
-//   can't tolerate OpenSSL as a dependency.
+//   can't tolerate BoringSSL or OpenSSL as a dependency.
 //
 
 #include "privacy_crypto.h"