Support for certificate status TLS extension.

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

diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509v3/v3_lib.c
index 844cee1c140ce8e69ac1c72137508f4e593f7ad2..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 */
@@ -228,7 +230,7 @@ void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx)
  * 'value' arguments (if relevant) are the extensions internal structure.
  */
 
-int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) *x, int nid, void *value,
+int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
                                        int crit, unsigned long flags)
 {
        int extidx = -1;
@@ -240,7 +242,7 @@ int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) *x, int nid, void *value,
         * look for existing extension.
         */
        if(ext_op != X509V3_ADD_APPEND)
-               extidx = X509v3_get_ext_by_NID(x, nid, -1);
+               extidx = X509v3_get_ext_by_NID(*x, nid, -1);
 
        /* See if extension exists */
        if(extidx >= 0) {
@@ -254,7 +256,7 @@ int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) *x, int nid, void *value,
                }
                /* If delete, just delete it */
                if(ext_op == X509V3_ADD_DELETE) {
-                       if(!sk_X509_EXTENSION_delete(x, extidx)) return -1;
+                       if(!sk_X509_EXTENSION_delete(*x, extidx)) return -1;
                        return 1;
                }
        } else {
@@ -275,25 +277,26 @@ 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);
-               return -1;
+               X509V3err(X509V3_F_X509V3_ADD1_I2D, X509V3_R_ERROR_CREATING_EXTENSION);
+               return 0;
        }
 
        /* If extension exists replace it.. */
        if(extidx >= 0) {
-               extmp = sk_X509_EXTENSION_value(x, extidx);
+               extmp = sk_X509_EXTENSION_value(*x, extidx);
                X509_EXTENSION_free(extmp);
-               if(!sk_X509_EXTENSION_set(x, extidx, ext)) return -1;
+               if(!sk_X509_EXTENSION_set(*x, extidx, ext)) return -1;
                return 1;
        }
 
-       if(!sk_X509_EXTENSION_push(x, ext)) return -1;
+       if(!*x && !(*x = sk_X509_EXTENSION_new_null())) return -1;
+       if(!sk_X509_EXTENSION_push(*x, ext)) return -1;
 
        return 1;
 
        err:
        if(!(flags & X509V3_ADD_SILENT))
-               X509V3err(X509V3_F_X509V3_ADD_I2D, errcode);
+               X509V3err(X509V3_F_X509V3_ADD1_I2D, errcode);
        return 0;
 }