import of OpenSSL 0.9.8h

1 files changed, 10 insertions, 21 deletions

diff --git a/src/lib/libcrypto/x509v3/v3_pci.c b/src/lib/libcrypto/x509v3/v3_pci.c
index b32d968619..601211f416 100644
--- a/src/lib/libcrypto/x509v3/v3_pci.c
+++ b/src/lib/libcrypto/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,
@@ -82,13 +82,13 @@ static int process_pci_value(CONF_VALUE *val,
                 {
                 if (*language)
                         {
-                        X509V3err(X509V3_F_R2I_PCI,X509V3_R_POLICY_LANGUAGE_ALREADTY_DEFINED);
+                        X509V3err(X509V3_F_PROCESS_PCI_VALUE,X509V3_R_POLICY_LANGUAGE_ALREADTY_DEFINED);
                         X509V3_conf_err(val);
                         return 0;
                         }
                 if (!(*language = OBJ_txt2obj(val->value, 0)))
                         {
-                        X509V3err(X509V3_F_R2I_PCI,X509V3_R_INVALID_OBJECT_IDENTIFIER);
+                        X509V3err(X509V3_F_PROCESS_PCI_VALUE,X509V3_R_INVALID_OBJECT_IDENTIFIER);
                         X509V3_conf_err(val);
                         return 0;
                         }
@@ -97,13 +97,13 @@ static int process_pci_value(CONF_VALUE *val,
                 {
                 if (*pathlen)
                         {
-                        X509V3err(X509V3_F_R2I_PCI,X509V3_R_POLICY_PATH_LENGTH_ALREADTY_DEFINED);
+                        X509V3err(X509V3_F_PROCESS_PCI_VALUE,X509V3_R_POLICY_PATH_LENGTH_ALREADTY_DEFINED);
                         X509V3_conf_err(val);
                         return 0;
                         }
                 if (!X509V3_get_value_int(val, pathlen))
                         {
-                        X509V3err(X509V3_F_R2I_PCI,X509V3_R_POLICY_PATH_LENGTH);
+                        X509V3err(X509V3_F_PROCESS_PCI_VALUE,X509V3_R_POLICY_PATH_LENGTH);
                         X509V3_conf_err(val);
                         return 0;
                         }
@@ -117,7 +117,7 @@ static int process_pci_value(CONF_VALUE *val,
                         *policy = ASN1_OCTET_STRING_new();
                         if (!*policy)
                                 {
-                                X509V3err(X509V3_F_R2I_PCI,ERR_R_MALLOC_FAILURE);
+                                X509V3err(X509V3_F_PROCESS_PCI_VALUE,ERR_R_MALLOC_FAILURE);
                                 X509V3_conf_err(val);
                                 return 0;
                                 }
@@ -148,7 +148,7 @@ static int process_pci_value(CONF_VALUE *val,
                         BIO *b = BIO_new_file(val->value + 5, "r");
                         if (!b)
                                 {
-                                X509V3err(X509V3_F_R2I_PCI,ERR_R_BIO_LIB);
+                                X509V3err(X509V3_F_PROCESS_PCI_VALUE,ERR_R_BIO_LIB);
                                 X509V3_conf_err(val);
                                 goto err;
                                 }
@@ -172,7 +172,7 @@ static int process_pci_value(CONF_VALUE *val,
 
                         if (n < 0)
                                 {
-                                X509V3err(X509V3_F_R2I_PCI,ERR_R_BIO_LIB);
+                                X509V3err(X509V3_F_PROCESS_PCI_VALUE,ERR_R_BIO_LIB);
                                 X509V3_conf_err(val);
                                 goto err;
                                 }
@@ -193,13 +193,13 @@ static int process_pci_value(CONF_VALUE *val,
                         }
                 else
                         {
-                        X509V3err(X509V3_F_R2I_PCI,X509V3_R_INCORRECT_POLICY_SYNTAX_TAG);
+                        X509V3err(X509V3_F_PROCESS_PCI_VALUE,X509V3_R_INCORRECT_POLICY_SYNTAX_TAG);
                         X509V3_conf_err(val);
                         goto err;
                         }
                 if (!tmp_data)
                         {
-                        X509V3err(X509V3_F_R2I_PCI,ERR_R_MALLOC_FAILURE);
+                        X509V3err(X509V3_F_PROCESS_PCI_VALUE,ERR_R_MALLOC_FAILURE);
                         X509V3_conf_err(val);
                         goto err;
                         }
@@ -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);