import of openssl-0.9.7g; tested on platforms from alpha to zaurus, ok deraadt@

1 files changed, 18 insertions, 17 deletions

diff --git a/src/lib/libcrypto/x509/x509_req.c b/src/lib/libcrypto/x509/x509_req.c
index 0affa3bf30..59fc6ca548 100644
--- a/src/lib/libcrypto/x509/x509_req.c
+++ b/src/lib/libcrypto/x509/x509_req.c
@@ -118,7 +118,7 @@ EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req)
  * 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;
 
@@ -143,32 +143,33 @@ void X509_REQ_set_extension_nids(int *nids)
 }
 
 STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req)
-{
+        {
         X509_ATTRIBUTE *attr;
-        STACK_OF(X509_ATTRIBUTE) *sk;
         ASN1_TYPE *ext = NULL;
-        int i;
+        int idx, *pnid;
         unsigned char *p;
-        if ((req == NULL) || (req->req_info == NULL))
+
+        if ((req == NULL) || (req->req_info == NULL) || !ext_nids)
                 return(NULL);
-        sk=req->req_info->attributes;
-        if (!sk) return NULL;
-        for(i = 0; i < sk_X509_ATTRIBUTE_num(sk); i++) {
-                attr = sk_X509_ATTRIBUTE_value(sk, i);
-                if(X509_REQ_extension_nid(OBJ_obj2nid(attr->object))) {
-                        if(attr->single) ext = attr->value.single;
-                        else if(sk_ASN1_TYPE_num(attr->value.set))
-                                ext = sk_ASN1_TYPE_value(attr->value.set, 0);
-                        break;
+        for (pnid = ext_nids; *pnid != NID_undef; pnid++)
+                {
+                idx = X509_REQ_get_attr_by_NID(req, *pnid, -1);
+                if (idx == -1)
+                        continue;
+                attr = X509_REQ_get_attr(req, idx);
+                if(attr->single) ext = attr->value.single;
+                else if(sk_ASN1_TYPE_num(attr->value.set))
+                        ext = sk_ASN1_TYPE_value(attr->value.set, 0);
+                break;
                 }
-        }
-        if(!ext || (ext->type != V_ASN1_SEQUENCE)) return NULL;
+        if(!ext || (ext->type != V_ASN1_SEQUENCE))
+                return NULL;
         p = ext->value.sequence->data;
         return d2i_ASN1_SET_OF_X509_EXTENSION(NULL, &p,
                         ext->value.sequence->length,
                         d2i_X509_EXTENSION, X509_EXTENSION_free,
                         V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
-}
+        }
 
 /* Add a STACK_OF extensions to a certificate request: allow alternative OIDs
  * in case we want to create a non standard one.