Fix from stable branch.
authorDr. Stephen Henson <steve@openssl.org>
Fri, 30 May 2008 10:57:49 +0000 (10:57 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Fri, 30 May 2008 10:57:49 +0000 (10:57 +0000)
crypto/x509/x509_att.c

index 511b49d..2c9061e 100644 (file)
@@ -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 (len == -1)
+       if ((len == -1) && !(attrtype & MBSTRING_FLAG))
                {
                if (!ASN1_TYPE_set1(ttmp, attrtype, data))
                        goto err;