summaryrefslogtreecommitdiffstats
path: root/crypto/x509/x509_att.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-05-30 10:57:49 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-05-30 10:57:49 +0000
commit83574cf80802ad3c322a6080f37f4141623f40e0 (patch)
treedd2974b8962053f82df223c99a7b8584c23222f5 /crypto/x509/x509_att.c
parent2cd81830ef23c2df4a954459cc73dd558b0b6a2b (diff)
Fix from stable branch.
Diffstat (limited to 'crypto/x509/x509_att.c')
-rw-r--r--crypto/x509/x509_att.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
index 511b49d589..2c9061e3d2 100644
--- 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 (len == -1)
+ if ((len == -1) && !(attrtype & MBSTRING_FLAG))
{
if (!ASN1_TYPE_set1(ttmp, attrtype, data))
goto err;