]>
Commit | Line | Data |
---|---|---|
1 | fix from upstream | |
2 | ||
3 | http://bugs.gentoo.org/224843 | |
4 | ||
5 | Index: crypto/x509/x509_att.c | |
6 | =================================================================== | |
7 | RCS file: /usr/local/src/openssl/CVSROOT/openssl/crypto/x509/x509_att.c,v | |
8 | retrieving revision 1.8.2.2 | |
9 | retrieving revision 1.8.2.3 | |
10 | diff -u -p -r1.8.2.2 -r1.8.2.3 | |
11 | --- crypto/x509/x509_att.c 2 Apr 2008 11:11:51 -0000 1.8.2.2 | |
12 | +++ crypto/x509/x509_att.c 30 May 2008 10:57:13 -0000 1.8.2.3 | |
13 | @@ -303,7 +303,7 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIB | |
14 | } | |
15 | if(!(attr->value.set = sk_ASN1_TYPE_new_null())) goto err; | |
16 | if(!(ttmp = ASN1_TYPE_new())) goto err; | |
17 | - if (len == -1) | |
18 | + if ((len == -1) && !(attrtype & MBSTRING_FLAG)) | |
19 | { | |
20 | if (!ASN1_TYPE_set1(ttmp, attrtype, data)) | |
21 | goto err; |