From 852fcec6fe7cfa5d7c83e2f494208588dd4b4031 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Mon, 21 Apr 2014 16:34:43 +0000
Subject: more malloc/realloc/calloc cleanups; ok beck kettenis

---
 src/lib/libssl/ssl_cert.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/lib/libssl/ssl_cert.c')

diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index 389d47408c..b493585c58 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -176,13 +176,11 @@ ssl_cert_new(void)
 {
 	CERT *ret;
 
-	ret = (CERT *)malloc(sizeof(CERT));
+	ret = calloc(1, sizeof(CERT));
 	if (ret == NULL) {
 		SSLerr(SSL_F_SSL_CERT_NEW, ERR_R_MALLOC_FAILURE);
 		return (NULL);
 	}
-	memset(ret, 0, sizeof(CERT));
-
 	ret->key = &(ret->pkeys[SSL_PKEY_RSA_ENC]);
 	ret->references = 1;
 	ssl_cert_set_default_md(ret);
@@ -195,14 +193,12 @@ ssl_cert_dup(CERT *cert)
 	CERT *ret;
 	int i;
 
-	ret = (CERT *)malloc(sizeof(CERT));
+	ret = calloc(1, sizeof(CERT));
 	if (ret == NULL) {
 		SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_MALLOC_FAILURE);
 		return (NULL);
 	}
 
-	memset(ret, 0, sizeof(CERT));
-
 	ret->key = &ret->pkeys[cert->key - &cert->pkeys[0]];
 	/* or ret->key = ret->pkeys + (cert->key - cert->pkeys),
 	 * if you find that more readable */
@@ -403,13 +399,11 @@ ssl_sess_cert_new(void)
 {
 	SESS_CERT *ret;
 
-	ret = malloc(sizeof *ret);
+	ret = calloc(1, sizeof *ret);
 	if (ret == NULL) {
 		SSLerr(SSL_F_SSL_SESS_CERT_NEW, ERR_R_MALLOC_FAILURE);
 		return NULL;
 	}
-
-	memset(ret, 0 , sizeof *ret);
 	ret->peer_key = &(ret->peer_pkeys[SSL_PKEY_RSA_ENC]);
 	ret->references = 1;
 
-- 
cgit v1.2.3-55-g6feb