commit e8290452c8c21b648393f487e2c8f9f39c2dafe2
author Treehugger Robot <treehugger-gerrit@google.com> Sat Aug 20 00:06:31 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Aug 20 00:06:31 2022 +0000
tree d8d644ac4e9b16e209f49035cf923bcfb6b6df96
parent e83f5ebcc68c7e7fa9e8dca35b85ce4b91296cff
parent 6def74e92040afc00e3809d2d919707183149bfb

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

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

Change-Id: I41e42a4f005bdfb3ddaa2b6cee436727c8195a96
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;
 }