generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When looking for request extensions in a certificate look first

Browse Source 
for the PKCS#9 OID then the non standard MS OID.
This commit is contained in:
Dr. Stephen Henson 2004-09-10 20:20:54 +00:00
parent d813ff2ac1
commit 58606421ae
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
crypto/x509/x509_req.c
View File

@ -158,7 +158,7 @@ int X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k)
* used and there may be more: so the list is configurable. * used and there may be more: so the list is configurable.
*/ */
static int ext_nid_list[] = { NID_ms_ext_req, NID_ext_req, NID_undef}; static int ext_nid_list[] = { NID_ext_req, NID_ms_ext_req, NID_undef};
static int *ext_nids = ext_nid_list; static int *ext_nids = ext_nid_list;
@ -183,27 +183,27 @@ void X509_REQ_set_extension_nids(int *nids)
} }
STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req) STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req)
{ {
X509_ATTRIBUTE *attr; X509_ATTRIBUTE *attr;
STACK_OF(X509_ATTRIBUTE) *sk;
ASN1_TYPE *ext = NULL; ASN1_TYPE *ext = NULL;
int i; int idx, *pnid;
const unsigned char *p; const unsigned char *p;
if ((req == NULL) || (req->req_info == NULL)) if ((req == NULL) || (req->req_info == NULL) || !ext_nids)
return(NULL); return(NULL);
sk=req->req_info->attributes; for (pnid = ext_nids; *pnid != NID_undef; pnid++)
if (!sk) return NULL; {
for(i = 0; i < sk_X509_ATTRIBUTE_num(sk); i++) { idx = X509_REQ_get_attr_by_NID(req, *pnid, -1);
attr = sk_X509_ATTRIBUTE_value(sk, i); if (idx == -1)
if(X509_REQ_extension_nid(OBJ_obj2nid(attr->object))) { continue;
if(attr->single) ext = attr->value.single; attr = X509_REQ_get_attr(req, idx);
else if(sk_ASN1_TYPE_num(attr->value.set)) if(attr->single) ext = attr->value.single;
ext = sk_ASN1_TYPE_value(attr->value.set, 0); else if(sk_ASN1_TYPE_num(attr->value.set))
break; ext = sk_ASN1_TYPE_value(attr->value.set, 0);
break;
} }
} if(!ext || (ext->type != V_ASN1_SEQUENCE))
if(!ext || (ext->type != V_ASN1_SEQUENCE)) return NULL; return NULL;
p = ext->value.sequence->data; p = ext->value.sequence->data;
return d2i_ASN1_SET_OF_X509_EXTENSION(NULL, &p, return d2i_ASN1_SET_OF_X509_EXTENSION(NULL, &p,
ext->value.sequence->length, ext->value.sequence->length,