summaryrefslogtreecommitdiff
path: root/crypto/pkcs7
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2000-11-18 18:17:56 +0000
committerDr. Stephen Henson <steve@openssl.org>2000-11-18 18:17:56 +0000
commit23c0d0a84aaf48013b9ed1b04d1108c4264e071a (patch)
treec6c458618f25d9692617f9240540874c72f43f97 /crypto/pkcs7
parente4ace1006a818debc89b0a2f67b24a156aa35840 (diff)
downloadopenssl-new-23c0d0a84aaf48013b9ed1b04d1108c4264e071a.tar.gz
X509_ATTRIBUTE implementation, with another caveat.
This is the first CHOICE type used and it also uses the combine option... Fix so the combine option now works :-)
Diffstat (limited to 'crypto/pkcs7')
-rw-r--r--crypto/pkcs7/pk7_doit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index 099e9651c1..c63d27e537 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -838,7 +838,7 @@ static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid)
xa=sk_X509_ATTRIBUTE_value(sk,i);
if (OBJ_cmp(xa->object,o) == 0)
{
- if (xa->set && sk_ASN1_TYPE_num(xa->value.set))
+ if (!xa->single && sk_ASN1_TYPE_num(xa->value.set))
return(sk_ASN1_TYPE_value(xa->value.set,0));
else
return(NULL);