From 6a09f1135761998b9a503e4c42a5f4f9b645163b Mon Sep 17 00:00:00 2001
From: Mariano Cano <mariano@smallstep.com>
Date: Wed, 15 Jul 2020 15:44:04 -0700
Subject: [PATCH] Use only the common name in iid subject..

---
 x509util/templates.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/x509util/templates.go b/x509util/templates.go
index 855370a1..a6548c14 100644
--- a/x509util/templates.go
+++ b/x509util/templates.go
@@ -87,11 +87,10 @@ const DefaultLeafTemplate = `{
 // The keyUsage "keyEncipherment" is special and it will be only used for RSA
 // keys.
 const DefaultIIDLeafTemplate = `{
-	{{- if .SANs }}
 	"subject": {"commonName": "{{ .Insecure.CR.Subject.CommonName }}"},
+	{{- if .SANs }}
 	"sans": {{ toJson .SANs }},
 	{{- else }}
-	"subject": {{ toJson .Insecure.CR.Subject }},
 	"dnsNames": {{ toJson .Insecure.CR.DNSNames }},
 	"emailAddresses": {{ toJson .Insecure.CR.EmailAddresses }},
 	"ipAddresses": {{ toJson .Insecure.CR.IPAddresses }},