X509V3_add_i2d() needs to be able to allocate a

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

diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509v3/v3_lib.c
index ea86b9ebb9581b3acd517b1c4a49b8f7707fa020..d8301a67bd2f6a1f84f06da49051d48de779ee59 100644 (file)
--- a/crypto/x509v3/v3_lib.c
+++ b/crypto/x509v3/v3_lib.c
@@ -163,8 +163,9 @@ void *X509V3_EXT_d2i(X509_EXTENSION *ext)
 {
        X509V3_EXT_METHOD *method;
        unsigned char *p;
-       if(!(method = X509V3_EXT_get(ext)) || !method->d2i) return NULL;
+       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);
        return method->d2i(NULL, &p, ext->value->length);
 }
 
@@ -212,7 +213,7 @@ void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx)
        }
        if(found_ex) {
                /* Found it */
-               if(crit) *crit = found_ex->critical;
+               if(crit) *crit = X509_EXTENSION_get_critical(found_ex);
                return X509V3_EXT_d2i(found_ex);
        }
 
@@ -222,4 +223,79 @@ void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx)
        return NULL;
 }
 
+/* This function is a general extension append, replace and delete utility.
+ * The precise operation is governed by the 'flags' value. The 'crit' and
+ * 'value' arguments (if relevant) are the extensions internal structure.
+ */
+
+int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
+                                       int crit, unsigned long flags)
+{
+       int extidx = -1;
+       int errcode;
+       X509_EXTENSION *ext, *extmp;
+       unsigned long ext_op = flags & X509V3_ADD_OP_MASK;
+
+       /* If appending we don't care if it exists, otherwise
+        * look for existing extension.
+        */
+       if(ext_op != X509V3_ADD_APPEND)
+               extidx = X509v3_get_ext_by_NID(*x, nid, -1);
+
+       /* See if extension exists */
+       if(extidx >= 0) {
+               /* If keep existing, nothing to do */
+               if(ext_op == X509V3_ADD_KEEP_EXISTING)
+                       return 1;
+               /* If default then its an error */
+               if(ext_op == X509V3_ADD_DEFAULT) {
+                       errcode = X509V3_R_EXTENSION_EXISTS;
+                       goto err;
+               }
+               /* If delete, just delete it */
+               if(ext_op == X509V3_ADD_DELETE) {
+                       if(!sk_X509_EXTENSION_delete(*x, extidx)) return -1;
+                       return 1;
+               }
+       } else {
+               /* If replace existing or delete, error since 
+                * extension must exist
+                */
+               if((ext_op == X509V3_ADD_REPLACE_EXISTING) ||
+                  (ext_op == X509V3_ADD_DELETE)) {
+                       errcode = X509V3_R_EXTENSION_NOT_FOUND;
+                       goto err;
+               }
+       }
+
+       /* If we get this far then we have to create an extension:
+        * could have some flags for alternative encoding schemes...
+        */
+
+       ext = X509V3_EXT_i2d(nid, crit, value);
+
+       if(!ext) {
+               X509V3err(X509V3_F_X509V3_ADD_I2D, X509V3_R_ERROR_CREATING_EXTENSION);
+               return -1;
+       }
+
+       /* If extension exists replace it.. */
+       if(extidx >= 0) {
+               extmp = sk_X509_EXTENSION_value(*x, extidx);
+               X509_EXTENSION_free(extmp);
+               if(!sk_X509_EXTENSION_set(*x, extidx, ext)) return -1;
+               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);
+       return 0;
+}
+
 IMPLEMENT_STACK_OF(X509V3_EXT_METHOD)