A few more ENGINE strings that need shortening.

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

diff --git a/crypto/x509v3/v3_extku.c b/crypto/x509v3/v3_extku.c
index a02644ae79424f325146ed219736e1a4ea1c55e6..58c1c2e6993538f4a770a4255646eb6da2f1c55c 100644 (file)
--- a/crypto/x509v3/v3_extku.c
+++ b/crypto/x509v3/v3_extku.c
@@ -70,7 +70,7 @@ static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(X509V3_EXT_METHOD *method,
 
 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,
@@ -82,7 +82,7 @@ X509V3_EXT_METHOD v3_ext_ku = {
 /* NB OCSP acceptable responses also is a SEQUENCE OF OBJECT */
 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,7 +93,7 @@ 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)
 
@@ -122,7 +122,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 +132,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;
                }