Allow multiple IDN xn-- indicators

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

diff --git a/crypto/x509v3/v3_extku.c b/crypto/x509v3/v3_extku.c
index a02644ae79424f325146ed219736e1a4ea1c55e6..1c66532757001fc762b8ea9cddbe064a9d1f55b0 100644 (file)
--- a/crypto/x509v3/v3_extku.c
+++ b/crypto/x509v3/v3_extku.c
@@ -1,5 +1,5 @@
 /* v3_extku.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 1999.
  */
 /* ====================================================================
@@ -63,14 +63,15 @@
 #include <openssl/conf.h>
 #include <openssl/x509v3.h>
 
-static void *v2i_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
-                               X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
+static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
+                                   X509V3_CTX *ctx,
+                                   STACK_OF(CONF_VALUE) *nval);
+static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
                void *eku, STACK_OF(CONF_VALUE) *extlist);
 
-X509V3_EXT_METHOD v3_ext_ku = {
+const X509V3_EXT_METHOD v3_ext_ku = {
        NID_ext_key_usage, 0,
-       &EXTENDED_KEY_USAGE_it,
+       ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
        0,0,0,0,
        0,0,
        i2v_EXTENDED_KEY_USAGE,
@@ -80,9 +81,9 @@ X509V3_EXT_METHOD v3_ext_ku = {
 };
 
 /* NB OCSP acceptable responses also is a SEQUENCE OF OBJECT */
-X509V3_EXT_METHOD v3_ocsp_accresp = {
+const X509V3_EXT_METHOD v3_ocsp_accresp = {
        NID_id_pkix_OCSP_acceptableResponses, 0,
-       &EXTENDED_KEY_USAGE_it,
+       ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
        0,0,0,0,
        0,0,
        i2v_EXTENDED_KEY_USAGE,
@@ -93,12 +94,13 @@ X509V3_EXT_METHOD v3_ocsp_accresp = {
 
 ASN1_ITEM_TEMPLATE(EXTENDED_KEY_USAGE) = 
        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, EXTENDED_KEY_USAGE, ASN1_OBJECT)
-ASN1_ITEM_TEMPLATE_END(EXTENDED_KEY_USAGE);
+ASN1_ITEM_TEMPLATE_END(EXTENDED_KEY_USAGE)
 
 IMPLEMENT_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
 
-static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
-               void *a, STACK_OF(CONF_VALUE) *ext_list)
+static STACK_OF(CONF_VALUE) *
+  i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method, void *a,
+                        STACK_OF(CONF_VALUE) *ext_list)
 {
        EXTENDED_KEY_USAGE *eku = a;
        int i;
@@ -112,8 +114,8 @@ static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
        return ext_list;
 }
 
-static void *v2i_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
-                               X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
+                                   X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 {
        EXTENDED_KEY_USAGE *extku;
        char *extval;
@@ -122,7 +124,7 @@ static void *v2i_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
        int i;
 
        if(!(extku = sk_ASN1_OBJECT_new_null())) {
-               X509V3err(X509V3_F_V2I_EXT_KU,ERR_R_MALLOC_FAILURE);
+               X509V3err(X509V3_F_V2I_EXTENDED_KEY_USAGE,ERR_R_MALLOC_FAILURE);
                return NULL;
        }
 
@@ -132,7 +134,7 @@ static void *v2i_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
                else extval = val->name;
                if(!(objtmp = OBJ_txt2obj(extval, 0))) {
                        sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free);
-                       X509V3err(X509V3_F_V2I_EXT_KU,X509V3_R_INVALID_OBJECT_IDENTIFIER);
+                       X509V3err(X509V3_F_V2I_EXTENDED_KEY_USAGE,X509V3_R_INVALID_OBJECT_IDENTIFIER);
                        X509V3_conf_err(val);
                        return NULL;
                }