From 47cdcd13ec3b3ad445c0834e7ba8042f6e58640b Mon Sep 17 00:00:00 2001
From: bcook <>
Date: Tue, 8 Jul 2014 16:36:45 +0000
Subject: replace malloc(strlen())/strlcpy with strdup

ok beck@ jsing@
---
 src/lib/libcrypto/conf/conf_def.c         | 5 ++---
 src/lib/libssl/src/crypto/conf/conf_def.c | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c
index c4703d883b..a5cfd86ae2 100644
--- a/src/lib/libcrypto/conf/conf_def.c
+++ b/src/lib/libcrypto/conf/conf_def.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_def.c,v 1.24 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: conf_def.c,v 1.25 2014/07/08 16:36:45 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -368,14 +368,13 @@ again:
 			}
 			if (psection == NULL)
 				psection = section;
-			v->name = malloc(strlen(pname) + 1);
+			v->name = strdup(pname);
 			v->value = NULL;
 			if (v->name == NULL) {
 				CONFerr(CONF_F_DEF_LOAD_BIO,
 				    ERR_R_MALLOC_FAILURE);
 				goto err;
 			}
-			strlcpy(v->name, pname, strlen(pname) + 1);
 			if (!str_copy(conf, psection, &(v->value), start))
 				goto err;
 
diff --git a/src/lib/libssl/src/crypto/conf/conf_def.c b/src/lib/libssl/src/crypto/conf/conf_def.c
index c4703d883b..a5cfd86ae2 100644
--- a/src/lib/libssl/src/crypto/conf/conf_def.c
+++ b/src/lib/libssl/src/crypto/conf/conf_def.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_def.c,v 1.24 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: conf_def.c,v 1.25 2014/07/08 16:36:45 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -368,14 +368,13 @@ again:
 			}
 			if (psection == NULL)
 				psection = section;
-			v->name = malloc(strlen(pname) + 1);
+			v->name = strdup(pname);
 			v->value = NULL;
 			if (v->name == NULL) {
 				CONFerr(CONF_F_DEF_LOAD_BIO,
 				    ERR_R_MALLOC_FAILURE);
 				goto err;
 			}
-			strlcpy(v->name, pname, strlen(pname) + 1);
 			if (!str_copy(conf, psection, &(v->value), start))
 				goto err;
 
-- 
cgit v1.2.3-55-g6feb