From 9358edf5dd46bb05de85378367f77c73de8a0392 Mon Sep 17 00:00:00 2001 From: Sean Parkinson Date: Wed, 9 May 2018 08:43:22 +1000 Subject: [PATCH] Fixes from code review Include new private key files in release. Set messages field to NULL after free. --- certs/include.am | 6 +++++- src/internal.c | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/certs/include.am b/certs/include.am index 55e8632f2..7a227aa95 100755 --- a/certs/include.am +++ b/certs/include.am @@ -72,6 +72,8 @@ EXTRA_DIST += \ certs/ed25519/client-ed25519-key.der \ certs/ed25519/client-ed25519-key.pem \ certs/ed25519/client-ed25519.pem \ + certs/ed25519/client-ed25519-priv.pem \ + certs/ed25519/client-ed25519-priv.pem \ certs/ed25519/root-ed25519.der \ certs/ed25519/root-ed25519-key.der \ certs/ed25519/root-ed25519-key.pem \ @@ -79,7 +81,9 @@ EXTRA_DIST += \ certs/ed25519/server-ed25519.der \ certs/ed25519/server-ed25519-key.der \ certs/ed25519/server-ed25519-key.pem \ - certs/ed25519/server-ed25519.pem + certs/ed25519/server-ed25519.pem \ + certs/ed25519/server-ed25519-priv.der \ + certs/ed25519/server-ed25519-priv.pem # ECC CA prime256v1 EXTRA_DIST += \ diff --git a/src/internal.c b/src/internal.c index 66c5b45b1..a45c7d54d 100644 --- a/src/internal.c +++ b/src/internal.c @@ -4328,8 +4328,10 @@ void FreeHandshakeHashes(WOLFSSL* ssl) wc_Sha512Free(&ssl->hsHashes->hashSha512); #endif #if defined(HAVE_ED25519) && !defined(WOLFSSL_NO_CLIENT_AUTH) - if (ssl->hsHashes->messages != NULL) + if (ssl->hsHashes->messages != NULL) { XFREE(ssl->hsHashes->messages, ssl->heap, DYNAMIC_TYPE_HASHES); + ssl->hsHashes->messages = NULL; + } #endif XFREE(ssl->hsHashes, ssl->heap, DYNAMIC_TYPE_HASHES);