From 916fe522a1262a3e669d715220a1d273877cca1a Mon Sep 17 00:00:00 2001
From: Steve Wall <Stephen.Wall@redcom.com>
Date: Wed, 1 Oct 2025 16:58:38 -0400
Subject: [PATCH] Print DirName differently in SAN's

When printing SubjectAlternativeNames, print the details of DirName entries in a different format than GENERAL_NAME_print() to avoid parsing issues due to commas.
---
 ext/openssl/openssl_backend_common.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/ext/openssl/openssl_backend_common.c b/ext/openssl/openssl_backend_common.c
index 611359cccaba6..75abae7483ca2 100644
--- a/ext/openssl/openssl_backend_common.c
+++ b/ext/openssl/openssl_backend_common.c
@@ -667,9 +667,29 @@ int openssl_x509v3_subjectAltName(BIO *bio, X509_EXTENSION *extension)
 				BIO_write(bio, ASN1_STRING_get0_data(as),
 					ASN1_STRING_length(as));
 				break;
+			case GEN_DIRNAME:
+				BIO_puts(bio, "DirName:");
+				char *ptr = X509_NAME_oneline(name->d.dirn, 0, 0);
+				char *p = ptr;
+				char *q;
+				while (*p) {
+					q = strchr(p, ',');
+					if (q) {
+						*q = '\0';
+						BIO_puts(bio, p);
+						BIO_puts(bio, "\\,");
+						p = q+1;
+					} else {
+						BIO_puts(bio, p);
+						*p = '\0';
+					}
+				}
+				BIO_puts(bio, "\n");
+				OPENSSL_free(ptr);
+				break;
 			default:
 				/* use builtin print for GEN_OTHERNAME, GEN_X400,
-				 * GEN_EDIPARTY, GEN_DIRNAME, GEN_IPADD and GEN_RID
+				 * GEN_EDIPARTY, GEN_IPADD and GEN_RID
 				 */
 				GENERAL_NAME_print(bio, name);
 			}