Update openssl to 1.0.2d

Also update Cryptlib to edk2 r17731

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>

1 files changed, 3 insertions, 58 deletions

diff --git a/Cryptlib/OpenSSL/crypto/x509v3/pcy_map.c b/Cryptlib/OpenSSL/crypto/x509v3/pcy_map.c
index 0067c3d1..b99eb91c 100644
--- a/Cryptlib/OpenSSL/crypto/x509v3/pcy_map.c
+++ b/Cryptlib/OpenSSL/crypto/x509v3/pcy_map.c
@@ -63,30 +63,6 @@
 
 #include "pcy_int.h"
 
-static int ref_cmp(const X509_POLICY_REF * const *a,
-                   const X509_POLICY_REF * const *b)
-{
-    return OBJ_cmp((*a)->subjectDomainPolicy, (*b)->subjectDomainPolicy);
-}
-
-static void policy_map_free(X509_POLICY_REF * map)
-{
-    OPENSSL_free(map);
-}
-
-static X509_POLICY_REF *policy_map_find(X509_POLICY_CACHE *cache,
-                                        ASN1_OBJECT *id)
-{
-    X509_POLICY_REF tmp;
-    int idx;
-    tmp.subjectDomainPolicy = id;
-
-    idx = sk_X509_POLICY_REF_find(cache->maps, &tmp);
-    if (idx == -1)
-        return NULL;
-    return sk_X509_POLICY_REF_value(cache->maps, idx);
-}
-
 /*
  * Set policy mapping entries in cache. Note: this modifies the passed
  * POLICY_MAPPINGS structure
@@ -95,8 +71,6 @@ static X509_POLICY_REF *policy_map_find(X509_POLICY_CACHE *cache,
 int policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
 {
     POLICY_MAPPING *map;
-    X509_POLICY_REF *ref = NULL;
-    ASN1_OBJECT *subjectDomainPolicyRef;
     X509_POLICY_DATA *data;
     X509_POLICY_CACHE *cache = x->policy_cache;
     int i;
@@ -105,7 +79,6 @@ int policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
         ret = -1;
         goto bad_mapping;
     }
-    cache->maps = sk_X509_POLICY_REF_new(ref_cmp);
     for (i = 0; i < sk_POLICY_MAPPING_num(maps); i++) {
         map = sk_POLICY_MAPPING_value(maps, i);
         /* Reject if map to or from anyPolicy */
@@ -115,12 +88,6 @@ int policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
             goto bad_mapping;
         }
 
-        /* If we've already mapped from this OID bad mapping */
-        if (policy_map_find(cache, map->subjectDomainPolicy) != NULL) {
-            ret = -1;
-            goto bad_mapping;
-        }
-
         /* Attempt to find matching policy data */
         data = policy_cache_find_data(cache, map->issuerDomainPolicy);
         /* If we don't have anyPolicy can't map */
@@ -135,7 +102,9 @@ int policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
             if (!data)
                 goto bad_mapping;
             data->qualifier_set = cache->anyPolicy->qualifier_set;
-            map->issuerDomainPolicy = NULL;
+            /*
+             * map->issuerDomainPolicy = NULL;
+             */
             data->flags |= POLICY_DATA_FLAG_MAPPED_ANY;
             data->flags |= POLICY_DATA_FLAG_SHARED_QUALIFIERS;
             if (!sk_X509_POLICY_DATA_push(cache->data, data)) {
@@ -144,41 +113,17 @@ int policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
             }
         } else
             data->flags |= POLICY_DATA_FLAG_MAPPED;
-
         if (!sk_ASN1_OBJECT_push(data->expected_policy_set,
                                  map->subjectDomainPolicy))
             goto bad_mapping;
-        /*
-         * map->subjectDomainPolicy will be freed when cache->data is freed.
-         * Set it to NULL to avoid double-free.
-         */
-        subjectDomainPolicyRef = map->subjectDomainPolicy;
         map->subjectDomainPolicy = NULL;
 
-        ref = OPENSSL_malloc(sizeof(X509_POLICY_REF));
-        if (!ref)
-            goto bad_mapping;
-
-        ref->subjectDomainPolicy = subjectDomainPolicyRef;
-        ref->data = data;
-
-        if (!sk_X509_POLICY_REF_push(cache->maps, ref))
-            goto bad_mapping;
-
-        ref = NULL;
-
     }
 
     ret = 1;
  bad_mapping:
     if (ret == -1)
         x->ex_flags |= EXFLAG_INVALID_POLICY;
-    if (ref)
-        policy_map_free(ref);
-    if (ret <= 0) {
-        sk_X509_POLICY_REF_pop_free(cache->maps, policy_map_free);
-        cache->maps = NULL;
-    }
     sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free);
     return ret;