From 385dd7189ab169144943cf806c605a511f066edd Mon Sep 17 00:00:00 2001 From: Sean Parkinson Date: Thu, 29 Mar 2018 14:55:55 +1000 Subject: [PATCH] wolfSSL: Use wolfSSL memory allocation in dh5_init() Signed-off-by: Sean Parkinson --- src/crypto/crypto_wolfssl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/crypto/crypto_wolfssl.c b/src/crypto/crypto_wolfssl.c index 3a8c4c5e8..30af62647 100644 --- a/src/crypto/crypto_wolfssl.c +++ b/src/crypto/crypto_wolfssl.c @@ -660,13 +660,13 @@ void * dh5_init(struct wpabuf **priv, struct wpabuf **publ) wpabuf_free(*publ); *publ = NULL; - dh = os_malloc(sizeof(DhKey)); + dh = XMALLOC(sizeof(DhKey), NULL, DYNAMIC_TYPE_TMP_BUFFER); if (!dh) return NULL; wc_InitDhKey(dh); if (wc_InitRng(&rng) != 0) { - os_free(dh); + XFREE(dh, NULL, DYNAMIC_TYPE_TMP_BUFFER); return NULL; } @@ -698,7 +698,7 @@ done: wpabuf_clear_free(privkey); if (dh) { wc_FreeDhKey(dh); - os_free(dh); + XFREE(dh, NULL, DYNAMIC_TYPE_TMP_BUFFER); } wc_FreeRng(&rng); return ret; @@ -712,12 +712,12 @@ void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ) byte *secret; word32 secret_sz; - dh = os_malloc(sizeof(DhKey)); + dh = XMALLOC(sizeof(DhKey), NULL, DYNAMIC_TYPE_TMP_BUFFER); if (!dh) return NULL; wc_InitDhKey(dh); - secret = os_malloc(RFC3526_LEN); + secret = XMALLOC(RFC3526_LEN, NULL, DYNAMIC_TYPE_TMP_BUFFER); if (!secret) goto done; @@ -740,9 +740,9 @@ void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ) done: if (dh) { wc_FreeDhKey(dh); - os_free(dh); + XFREE(dh, NULL, DYNAMIC_TYPE_TMP_BUFFER); } - os_free(secret); + XFREE(secret, NULL, DYNAMIC_TYPE_TMP_BUFFER); return ret; } @@ -779,7 +779,7 @@ void dh5_free(void *ctx) return; wc_FreeDhKey(ctx); - os_free(ctx); + XFREE(ctx, NULL, DYNAMIC_TYPE_TMP_BUFFER); } #endif /* CONFIG_WPS_NFC */