commit 13591647b071807213a542f39637b5f63f7db94f
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 19 22:43:25 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 19 22:43:25 2020 +0000
tree f7ea777a9afc1d7906cd77c2c1c7abff5512fa5e
parent 3d3364efdcd4bf765e66d193fae2573981d4cd79
parent 7088fa331408badea63a2bc00f60cb6c3d182d29

Merge "Don't call ERR_error_string in keymaster"

km_openssl/block_cipher_operation.cpp

diff --git a/km_openssl/block_cipher_operation.cpp b/km_openssl/block_cipher_operation.cpp
index 4a34b35..ba75785 100644
--- a/km_openssl/block_cipher_operation.cpp
+++ b/km_openssl/block_cipher_operation.cpp
@@ -197,7 +197,9 @@
     int output_written = -1;
     if (!EVP_CipherFinal_ex(&ctx_, output->peek_write(), &output_written)) {
         if (tag_length_ > 0) return KM_ERROR_VERIFICATION_FAILED;
-        LOG_E("Error encrypting final block: %s", ERR_error_string(ERR_peek_last_error(), nullptr));
+        char buf[128];
+        ERR_error_string_n(ERR_peek_last_error(), buf, sizeof(buf));
+        LOG_E("Error encrypting final block: %s", buf);
         return TranslateLastOpenSslError();
     }
 

km_openssl/openssl_err.cpp

diff --git a/km_openssl/openssl_err.cpp b/km_openssl/openssl_err.cpp
index 1391f40..d94897e 100644
--- a/km_openssl/openssl_err.cpp
+++ b/km_openssl/openssl_err.cpp
@@ -44,7 +44,9 @@
     unsigned long error = ERR_peek_last_error();
 
     if (log_message) {
-        LOG_D("%s", ERR_error_string(error, nullptr));
+        char buf[128];
+        ERR_error_string_n(error, buf, sizeof(buf));
+        LOG_D("%s", buf);
     }
 
     int reason = ERR_GET_REASON(error);