Complete synchronization of aes-x86_64 with aes-586.

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

diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509v3/v3_lib.c
index 9ea59fb8f9fa6434c2fd1efc684b7a6c4734947b..f3015ea610cbdff91ae1fd8772f952773a65c6ea 100644 (file)
--- a/crypto/x509v3/v3_lib.c
+++ b/crypto/x509v3/v3_lib.c
@@ -162,10 +162,11 @@ int X509V3_add_standard_extensions(void)
 void *X509V3_EXT_d2i(X509_EXTENSION *ext)
 {
        X509V3_EXT_METHOD *method;
-       unsigned char *p;
+       const unsigned char *p;
+
        if(!(method = X509V3_EXT_get(ext))) return NULL;
        p = ext->value->data;
-       if(method->it) return ASN1_item_d2i(NULL, &p, ext->value->length, method->it);
+       if(method->it) return ASN1_item_d2i(NULL, &p, ext->value->length, ASN1_ITEM_ptr(method->it));
        return method->d2i(NULL, &p, ext->value->length);
 }
 
@@ -202,6 +203,7 @@ void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx)
                if(OBJ_obj2nid(ex->object) == nid) {
                        if(idx) {
                                *idx = i;
+                               found_ex = ex;
                                break;
                        } else if(found_ex) {
                                /* Found more than one */
@@ -275,7 +277,7 @@ int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
        ext = X509V3_EXT_i2d(nid, crit, value);
 
        if(!ext) {
-               X509V3err(X509V3_F_X509V3_ADD_I2D, X509V3_R_ERROR_CREATING_EXTENSION);
+               X509V3err(X509V3_F_X509V3_ADD1_I2D, X509V3_R_ERROR_CREATING_EXTENSION);
                return 0;
        }
 
@@ -294,7 +296,7 @@ int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
 
        err:
        if(!(flags & X509V3_ADD_SILENT))
-               X509V3err(X509V3_F_X509V3_ADD_I2D, errcode);
+               X509V3err(X509V3_F_X509V3_ADD1_I2D, errcode);
        return 0;
 }