From 7c5921e7362e0e5ddd84a0b51d678b66a6801a01 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Fri, 14 Sep 2007 18:11:17 +0000
Subject: [PATCH] Handle empty case in X509_NAME canonical encoding.

---
 crypto/asn1/x_name.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crypto/asn1/x_name.c b/crypto/asn1/x_name.c
index 50d3c7597..193f6d440 100644
--- a/crypto/asn1/x_name.c
+++ b/crypto/asn1/x_name.c
@@ -320,6 +320,12 @@ static int x509_name_canon(X509_NAME *a)
 		OPENSSL_free(a->canon_enc);
 		a->canon_enc = NULL;
 		}
+	/* Special case: empty X509_NAME => null encoding */
+	if (sk_X509_NAME_ENTRY_num(a->entries) == 0)
+		{
+		a->canon_enclen = 0;
+		return 1;
+		}
 	intname = sk_new_null();
 	if(!intname)
 		goto err;