From f6d7af173d7965ae8c7535868cb24b28f0c8f072 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 16 Oct 2014 10:43:54 +0000
Subject: Repair BUF_strdup() breakage.

---
 src/usr.bin/openssl/apps.c | 6 ++++--
 src/usr.bin/openssl/req.c  | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c
index c4ab7c8350..6ffdf3df1a 100644
--- a/src/usr.bin/openssl/apps.c
+++ b/src/usr.bin/openssl/apps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.c,v 1.10 2014/09/01 14:21:06 jsing Exp $ */
+/* $OpenBSD: apps.c,v 1.11 2014/10/16 10:43:54 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -2107,7 +2107,9 @@ pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value)
 	int rv;
 	char *stmp, *vtmp = NULL;
 
-	stmp = BUF_strdup(value);
+	if (value == NULL)
+		return -1;
+	stmp = strdup(value);
 	if (!stmp)
 		return -1;
 	vtmp = strchr(stmp, ':');
diff --git a/src/usr.bin/openssl/req.c b/src/usr.bin/openssl/req.c
index 99f10ecde0..1d50524052 100644
--- a/src/usr.bin/openssl/req.c
+++ b/src/usr.bin/openssl/req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: req.c,v 1.3 2014/10/01 13:15:40 sthen Exp $ */
+/* $OpenBSD: req.c,v 1.4 2014/10/16 10:43:54 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1480,7 +1480,7 @@ set_keygen_ctx(BIO * err, const char *gstr, int *pkey_type,
 			return NULL;
 		}
 		EVP_PKEY_asn1_get0_info(NULL, NULL, NULL, NULL, &anam, ameth);
-		*palgnam = BUF_strdup(anam);
+		*palgnam = strdup(anam);
 #ifndef OPENSSL_NO_ENGINE
 		if (tmpeng)
 			ENGINE_finish(tmpeng);
-- 
cgit v1.2.3-55-g6feb