From a901539e7593dfd0cb8170bdfd94856651828ca2 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Sun, 20 Apr 2014 14:03:55 +0000
Subject: calloc() rather than malloc+memset

---
 src/lib/libssl/d1_lib.c         | 4 ++--
 src/lib/libssl/src/ssl/d1_lib.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c
index 0217b68928..1dc0efc29c 100644
--- a/src/lib/libssl/d1_lib.c
+++ b/src/lib/libssl/d1_lib.c
@@ -100,8 +100,8 @@ dtls1_new(SSL *s)
 
 	if (!ssl3_new(s))
 		return (0);
-	if ((d1 = malloc(sizeof *d1)) == NULL) return (0);
-		memset(d1, 0, sizeof *d1);
+	if ((d1 = calloc(1, sizeof *d1)) == NULL)
+		return (0);
 
 	/* d1->handshake_epoch=0; */
 
diff --git a/src/lib/libssl/src/ssl/d1_lib.c b/src/lib/libssl/src/ssl/d1_lib.c
index 0217b68928..1dc0efc29c 100644
--- a/src/lib/libssl/src/ssl/d1_lib.c
+++ b/src/lib/libssl/src/ssl/d1_lib.c
@@ -100,8 +100,8 @@ dtls1_new(SSL *s)
 
 	if (!ssl3_new(s))
 		return (0);
-	if ((d1 = malloc(sizeof *d1)) == NULL) return (0);
-		memset(d1, 0, sizeof *d1);
+	if ((d1 = calloc(1, sizeof *d1)) == NULL)
+		return (0);
 
 	/* d1->handshake_epoch=0; */
 
-- 
cgit v1.2.3-55-g6feb