1 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c
index b832deb928..1885d699ef 100644
--- a/src/lib/libcrypto/asn1/x_name.c
+++ b/src/lib/libcrypto/asn1/x_name.c
@@ -141,10 +141,12 @@ static int i2d_X509_NAME_entries(X509_NAME *a)
                         }
                 size+=i2d_X509_NAME_ENTRY(ne,NULL);
                 }
-
-        ret+=ASN1_object_size(1,size,V_ASN1_SET);
         if (fe != NULL)
+                {
+                /* SET OF needed only if entries is non empty */
+                ret+=ASN1_object_size(1,size,V_ASN1_SET);
                 fe->size=size;
+                }
 
         r=ASN1_object_size(1,ret,V_ASN1_SEQUENCE);