Allow multiple IDN xn-- indicators

[openssl.git] / crypto / x509v3 / pcy_data.c

diff --git a/crypto/x509v3/pcy_data.c b/crypto/x509v3/pcy_data.c
index fae74cac924c56c7afc60e8c68e9851f9b5f4112..3444b03195055e86b4406937c9bf77f203a26a32 100644 (file)
--- a/crypto/x509v3/pcy_data.c
+++ b/crypto/x509v3/pcy_data.c
@@ -1,5 +1,5 @@
 /* pcy_data.c */
 /* pcy_data.c */

-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL

  * project 2004.
  */
 /* ====================================================================
  * project 2004.
  */
 /* ====================================================================


@@ -69,7 +69,7 @@ void policy_data_free(X509_POLICY_DATA *data)
        ASN1_OBJECT_free(data->valid_policy);
        /* Don't free qualifiers if shared */
        if (!(data->flags & POLICY_DATA_FLAG_SHARED_QUALIFIERS))
        ASN1_OBJECT_free(data->valid_policy);
        /* Don't free qualifiers if shared */
        if (!(data->flags & POLICY_DATA_FLAG_SHARED_QUALIFIERS))

-               sk_POLICYINFO_pop_free(data->qualifier_set,
+               sk_POLICYQUALINFO_pop_free(data->qualifier_set,

                                        POLICYQUALINFO_free);
        sk_ASN1_OBJECT_pop_free(data->expected_policy_set, ASN1_OBJECT_free);
        OPENSSL_free(data);
                                        POLICYQUALINFO_free);
        sk_ASN1_OBJECT_pop_free(data->expected_policy_set, ASN1_OBJECT_free);
        OPENSSL_free(data);


@@ -82,11 +82,21 @@ void policy_data_free(X509_POLICY_DATA *data)
  * another source.
  */
 
  * another source.
  */
 

-X509_POLICY_DATA *policy_data_new(POLICYINFO *policy, ASN1_OBJECT *id, int crit)
+X509_POLICY_DATA *policy_data_new(POLICYINFO *policy,
+                                       const ASN1_OBJECT *cid, int crit)

        {
        X509_POLICY_DATA *ret;
        {
        X509_POLICY_DATA *ret;

-       if (!policy && !id)
+       ASN1_OBJECT *id;
+       if (!policy && !cid)

                return NULL;
                return NULL;

+       if (cid)
+               {
+               id = OBJ_dup(cid);
+               if (!id)
+                       return NULL;
+               }
+       else
+               id = NULL;

        ret = OPENSSL_malloc(sizeof(X509_POLICY_DATA));
        if (!ret)
                return NULL;
        ret = OPENSSL_malloc(sizeof(X509_POLICY_DATA));
        if (!ret)
                return NULL;


@@ -94,6 +104,8 @@ X509_POLICY_DATA *policy_data_new(POLICYINFO *policy, ASN1_OBJECT *id, int crit)
        if (!ret->expected_policy_set)
                {
                OPENSSL_free(ret);
        if (!ret->expected_policy_set)
                {
                OPENSSL_free(ret);

+               if (id)
+                       ASN1_OBJECT_free(id);

                return NULL;
                }
 
                return NULL;
                }