Fix from stable branch.

diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
index 511b49d589840dd3494a1174e9331e974d08fb5a..2c9061e3d2f3e841b9b16f533d9c6bb15f2a328f 100644 (file)
--- a/crypto/x509/x509_att.c
+++ b/crypto/x509/x509_att.c
@@ -303,7 +303,7 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *dat
        }
        if(!(attr->value.set = sk_ASN1_TYPE_new_null())) goto err;
        if(!(ttmp = ASN1_TYPE_new())) goto err;
        }
        if(!(attr->value.set = sk_ASN1_TYPE_new_null())) goto err;
        if(!(ttmp = ASN1_TYPE_new())) goto err;

-       if (len == -1)
+       if ((len == -1) && !(attrtype & MBSTRING_FLAG))

                {
                if (!ASN1_TYPE_set1(ttmp, attrtype, data))
                        goto err;
                {
                if (!ASN1_TYPE_set1(ttmp, attrtype, data))
                        goto err;