From 95a85d16d2e42e2dba47fe004610734d2db32af7 Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Tue, 19 Apr 2022 08:49:05 -0700
Subject: [PATCH] Fix for issue with `error: format string is not a string
 literal`.

---
 src/bio.c  | 8 ++++++++
 src/x509.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/bio.c b/src/bio.c
index e7d299aed..b38bc8956 100644
--- a/src/bio.c
+++ b/src/bio.c
@@ -2866,6 +2866,10 @@ void *wolfSSL_BIO_get_ex_data(WOLFSSL_BIO *bio, int idx)
 
 #if defined(OPENSSL_EXTRA)
 /* returns amount printed on success, negative in fail case */
+#ifdef __clang__
+/* tell clang argument 2 is format */
+__attribute__((__format__ (__printf__, 2, 0)))
+#endif
 int wolfSSL_BIO_vprintf(WOLFSSL_BIO* bio, const char* format, va_list args)
 {
     int ret = -1;
@@ -2929,6 +2933,10 @@ int wolfSSL_BIO_vprintf(WOLFSSL_BIO* bio, const char* format, va_list args)
 }
 
 /* returns amount printed on success, negative in fail case */
+#ifdef __clang__
+/* tell clang argument 2 is format */
+__attribute__((__format__ (__printf__, 2, 0)))
+#endif
 int wolfSSL_BIO_printf(WOLFSSL_BIO* bio, const char* format, ...)
 {
     int ret;
diff --git a/src/x509.c b/src/x509.c
index 7fd1e18ef..e74070f3d 100644
--- a/src/x509.c
+++ b/src/x509.c
@@ -4276,7 +4276,7 @@ int wolfSSL_GENERAL_NAME_print(WOLFSSL_BIO* out, WOLFSSL_GENERAL_NAME* gen)
         ret = wolfSSL_BIO_printf(out, "DNS:");
         ret = (ret > 0) ? WOLFSSL_SUCCESS : WOLFSSL_FAILURE;
         if (ret == WOLFSSL_SUCCESS) {
-            ret = wolfSSL_BIO_printf(out, gen->d.dNSName->strData);
+            ret = wolfSSL_BIO_printf(out, "%s", gen->d.dNSName->strData);
             ret = (ret > 0) ? WOLFSSL_SUCCESS : WOLFSSL_FAILURE;
         }
         break;