diff --git a/src/tpm2/crypto/openssl/CryptEccMain.c b/src/tpm2/crypto/openssl/CryptEccMain.c
index 87b202a2..0d7c1b5b 100644
--- a/src/tpm2/crypto/openssl/CryptEccMain.c
+++ b/src/tpm2/crypto/openssl/CryptEccMain.c
@@ -706,10 +706,7 @@ LIB_EXPORT BOOL CryptEccIsPointOnCurve(
     //
     pAssert(Qin != NULL);
     OK = (E != NULL && (ExtEcc_IsPointOnCurve(ecQ, E)));
-    if (E) {
-	OsslContextLeave(E->CTX); // libtpms added: avoid memory leak
-	EC_GROUP_free(E->G);
-    }
+    CRYPT_CURVE_FREE(E); // libtpms added
     return OK;
 }