commit d6835f63466586e8be748a0cbe0d8c92a64f1f69
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 19 23:12:11 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 19 23:12:11 2022 +0000
tree d2cb7b4c5abe52a0b19990ff5112f78f0390ea02
parent 599f7c0175f32958300413ebaa284610f96093e4
parent 89b620d11718f3241833505308c0d0ee0cd7a759

Merge "Release the memory allocated in the algorithm to prevent memory leaks" am: a3fe17250d am: a80338f802 am: 89b620d117

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2186106

Change-Id: I0d9fadac7dfe9b94340fa900e744258aa6eda345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

identity/aidl/default/EicOpsImpl.cc

diff --git a/identity/aidl/default/EicOpsImpl.cc b/identity/aidl/default/EicOpsImpl.cc
index 3fd9f1d..b6d324f 100644
--- a/identity/aidl/default/EicOpsImpl.cc
+++ b/identity/aidl/default/EicOpsImpl.cc
@@ -100,6 +100,7 @@
     if (size != EIC_SHA256_DIGEST_SIZE) {
         LOG(ERROR) << "Expected 32 bytes from HMAC_Final, got " << size;
     }
+    HMAC_CTX_cleanup(realCtx);
 }
 
 void eicOpsSha256Init(EicSha256Ctx* ctx) {
@@ -394,14 +395,17 @@
     }
 
     if (BN_bn2binpad(sig->r, signature, 32) != 32) {
+        ECDSA_SIG_free(sig);
         eicDebug("Error encoding r");
         return false;
     }
     if (BN_bn2binpad(sig->s, signature + 32, 32) != 32) {
+        ECDSA_SIG_free(sig);
         eicDebug("Error encoding s");
         return false;
     }
 
+    ECDSA_SIG_free(sig);
     return true;
 }