From fd2b104b2d09810415539af0fb59ba7228a7b6fa Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 5 Aug 2016 17:25:51 +0000
Subject: Do not *printf %s NULL ok bcook

---
 src/lib/libcrypto/conf/conf_lib.c         | 5 +++--
 src/lib/libssl/src/crypto/conf/conf_lib.c | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/conf/conf_lib.c b/src/lib/libcrypto/conf/conf_lib.c
index a7c8be7c0d..c7e026e725 100644
--- a/src/lib/libcrypto/conf/conf_lib.c
+++ b/src/lib/libcrypto/conf/conf_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_lib.c,v 1.13 2015/02/07 13:19:15 doug Exp $ */
+/* $OpenBSD: conf_lib.c,v 1.14 2016/08/05 17:25:51 deraadt Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2000.
  */
@@ -321,7 +321,8 @@ NCONF_get_string(const CONF *conf, const char *group, const char *name)
 		return NULL;
 	}
 	CONFerr(CONF_F_NCONF_GET_STRING, CONF_R_NO_VALUE);
-	ERR_asprintf_error_data("group=%s name=%s", group, name);
+	ERR_asprintf_error_data("group=%s name=%s",
+	    group ? group : "", name);
 	return NULL;
 }
 
diff --git a/src/lib/libssl/src/crypto/conf/conf_lib.c b/src/lib/libssl/src/crypto/conf/conf_lib.c
index a7c8be7c0d..c7e026e725 100644
--- a/src/lib/libssl/src/crypto/conf/conf_lib.c
+++ b/src/lib/libssl/src/crypto/conf/conf_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_lib.c,v 1.13 2015/02/07 13:19:15 doug Exp $ */
+/* $OpenBSD: conf_lib.c,v 1.14 2016/08/05 17:25:51 deraadt Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2000.
  */
@@ -321,7 +321,8 @@ NCONF_get_string(const CONF *conf, const char *group, const char *name)
 		return NULL;
 	}
 	CONFerr(CONF_F_NCONF_GET_STRING, CONF_R_NO_VALUE);
-	ERR_asprintf_error_data("group=%s name=%s", group, name);
+	ERR_asprintf_error_data("group=%s name=%s",
+	    group ? group : "", name);
 	return NULL;
 }
 
-- 
cgit v1.2.3-55-g6feb