From: Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Date: Sat, 15 Oct 2016 22:53:33 +0000 (+0200)
Subject: Fix leak of secrecy in ecdh_compute_key()
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a100602d58b0a2cfba1c0419470e637bb5fd227d;p=oweals%2Fopenssl.git

Fix leak of secrecy in ecdh_compute_key()

A temporary buffer containing g^xy was not cleared in ecdh_compute_key()
before freeing it, so the shared secret was leaked in memory.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 0e4690165b4beb6777b747b0aeb1646a301f41d9)
---

diff --git a/crypto/ecdh/ech_ossl.c b/crypto/ecdh/ech_ossl.c
index d448b19a52..2d14252dce 100644
--- a/crypto/ecdh/ech_ossl.c
+++ b/crypto/ecdh/ech_ossl.c
@@ -202,7 +202,9 @@ static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
         BN_CTX_end(ctx);
     if (ctx)
         BN_CTX_free(ctx);
-    if (buf)
+    if (buf) {
+        OPENSSL_cleanse(buf, buflen);
         OPENSSL_free(buf);
+    }
     return (ret);
 }