Update from HEAD.

[oweals/openssl.git] / crypto / x509v3 / v3_pci.c

diff --git a/crypto/x509v3/v3_pci.c b/crypto/x509v3/v3_pci.c
index ccb0da548ac4110225a2b1233101aa606a09f488..601211f41691f75f34eb40c79d8c0c4fd083a136 100644 (file)
--- a/crypto/x509v3/v3_pci.c
+++ b/crypto/x509v3/v3_pci.c
@@ -44,7 +44,7 @@ static int i2r_pci(X509V3_EXT_METHOD *method, PROXY_CERT_INFO_EXTENSION *ext,
 static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
        X509V3_CTX *ctx, char *str);
 
-X509V3_EXT_METHOD v3_pci =
+const X509V3_EXT_METHOD v3_pci =
        { NID_proxyCertInfo, 0, ASN1_ITEM_ref(PROXY_CERT_INFO_EXTENSION),
          0,0,0,0,
          0,0,
@@ -286,12 +286,6 @@ static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
                X509V3err(X509V3_F_R2I_PCI,ERR_R_MALLOC_FAILURE);
                goto err;
                }
-       pci->proxyPolicy = PROXY_POLICY_new();
-       if (!pci->proxyPolicy)
-               {
-               X509V3err(X509V3_F_R2I_PCI,ERR_R_MALLOC_FAILURE);
-               goto err;
-               }
 
        pci->proxyPolicy->policyLanguage = language; language = NULL;
        pci->proxyPolicy->policy = policy; policy = NULL;
@@ -301,11 +295,6 @@ err:
        if (language) { ASN1_OBJECT_free(language); language = NULL; }
        if (pathlen) { ASN1_INTEGER_free(pathlen); pathlen = NULL; }
        if (policy) { ASN1_OCTET_STRING_free(policy); policy = NULL; }
-       if (pci && pci->proxyPolicy)
-               {
-               PROXY_POLICY_free(pci->proxyPolicy);
-               pci->proxyPolicy = NULL;
-               }
        if (pci) { PROXY_CERT_INFO_EXTENSION_free(pci); pci = NULL; }
 end:
        sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);