From f0abd4ea82095912186abe6210dc820604885eac Mon Sep 17 00:00:00 2001
From: Juliusz Sosinowicz <juliusz@wolfssl.com>
Date: Fri, 25 Oct 2019 10:46:22 +0200
Subject: [PATCH] WIP

---
 configure.ac | 4 ----
 src/ssl.c    | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index c0d84e739..90c1bc32e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -538,10 +538,6 @@ then
     ENABLED_OPENSSLALL="yes"
 fi
 
-if test "$ENABLED_NGINX" = "yes"
-then
-    ENABLED_OPENSSLALL="yes"
-fi
 if test "$ENABLED_OPENSSLALL" = "yes"
 then
 AM_CFLAGS="-DOPENSSL_ALL -DWOLFSSL_EITHER_SIDE $AM_CFLAGS"
diff --git a/src/ssl.c b/src/ssl.c
index 4964cb514..f487741bc 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -39448,7 +39448,7 @@ void wolfSSL_sk_X509_NAME_free(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk)
     wolfSSL_sk_X509_NAME_pop_free(sk, NULL);
 }
 
-#if defined(WOLFSSL_APACHE_HTTPD) || defined(OPENSSL_ALL)
+#if defined(WOLFSSL_APACHE_HTTPD) || defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX)
 /* Helper function for X509_NAME_print_ex. Sets *buf to string for domain
    name attribute based on NID. Returns size of buf */
 static int get_dn_attr_by_nid(int n, const char** buf)
@@ -39503,7 +39503,7 @@ static int get_dn_attr_by_nid(int n, const char** buf)
 int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
                 int indent, unsigned long flags)
 {
-#if defined(WOLFSSL_APACHE_HTTPD) || defined(OPENSSL_ALL)
+#if defined(WOLFSSL_APACHE_HTTPD) || defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX)
     int count = 0, len = 0, totalSz = 0, tmpSz = 0;
     char tmp[ASN_NAME_MAX];
     char fullName[ASN_NAME_MAX];