From 896ee758458e7d17dd2014f065480b5085e6be10 Mon Sep 17 00:00:00 2001
From: tedu <>
Date: Sun, 25 May 2014 20:28:50 +0000
Subject: calloc instead of malloc/memset. from Benjamin Baier

---
 src/lib/libcrypto/x509/x509_vfy.c | 3 +--
 src/lib/libcrypto/x509/x509_vpm.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/lib/libcrypto/x509')

diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
index 0024904c20..7da415f27c 100644
--- a/src/lib/libcrypto/x509/x509_vfy.c
+++ b/src/lib/libcrypto/x509/x509_vfy.c
@@ -1950,12 +1950,11 @@ X509_STORE_CTX_new(void)
 {
 	X509_STORE_CTX *ctx;
 
-	ctx = (X509_STORE_CTX *)malloc(sizeof(X509_STORE_CTX));
+	ctx = calloc(1, sizeof(X509_STORE_CTX));
 	if (!ctx) {
 		X509err(X509_F_X509_STORE_CTX_NEW, ERR_R_MALLOC_FAILURE);
 		return NULL;
 	}
-	memset(ctx, 0, sizeof(X509_STORE_CTX));
 	return ctx;
 }
 
diff --git a/src/lib/libcrypto/x509/x509_vpm.c b/src/lib/libcrypto/x509/x509_vpm.c
index f0d2a0902e..c2cebd936f 100644
--- a/src/lib/libcrypto/x509/x509_vpm.c
+++ b/src/lib/libcrypto/x509/x509_vpm.c
@@ -90,8 +90,7 @@ X509_VERIFY_PARAM_new(void)
 {
 	X509_VERIFY_PARAM *param;
 
-	param = malloc(sizeof(X509_VERIFY_PARAM));
-	memset(param, 0, sizeof(X509_VERIFY_PARAM));
+	param = calloc(1, sizeof(X509_VERIFY_PARAM));
 	x509_verify_param_zero(param);
 	return param;
 }
-- 
cgit v1.2.3-55-g6feb