Merge from the ASN1 branch of new ASN1 code

[openssl.git] / crypto / x509 / x509_v3.c

diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c
index 18193c33fe29ce7e75a5aba5992e8eb5100bb407..b5f7daa2e58910dbb22be34141842e79fe78126f 100644 (file)
--- a/crypto/x509/x509_v3.c
+++ b/crypto/x509/x509_v3.c
@@ -63,14 +63,16 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
+#include <openssl/x509v3.h>
 
-int X509v3_get_ext_count(STACK *x)
+int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x)
        {
        if (x == NULL) return(0);
-       return(sk_num(x));
+       return(sk_X509_EXTENSION_num(x));
        }
 
-int X509v3_get_ext_by_NID(STACK *x, int nid, int lastpos)
+int X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x, int nid,
+                         int lastpos)
        {
        ASN1_OBJECT *obj;
 
@@ -79,7 +81,8 @@ int X509v3_get_ext_by_NID(STACK *x, int nid, int lastpos)
        return(X509v3_get_ext_by_OBJ(x,obj,lastpos));
        }
 
-int X509v3_get_ext_by_OBJ(STACK *sk, ASN1_OBJECT *obj, int lastpos)
+int X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk, ASN1_OBJECT *obj,
+                         int lastpos)
        {
        int n;
        X509_EXTENSION *ex;
@@ -88,17 +91,18 @@ int X509v3_get_ext_by_OBJ(STACK *sk, ASN1_OBJECT *obj, int lastpos)
        lastpos++;
        if (lastpos < 0)
                lastpos=0;
-       n=sk_num(sk);
+       n=sk_X509_EXTENSION_num(sk);
        for ( ; lastpos < n; lastpos++)
                {
-               ex=(X509_EXTENSION *)sk_value(sk,lastpos);
+               ex=sk_X509_EXTENSION_value(sk,lastpos);
                if (OBJ_cmp(ex->object,obj) == 0)
                        return(lastpos);
                }
        return(-1);
        }
 
-int X509v3_get_ext_by_critical(STACK *sk, int crit, int lastpos)
+int X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit,
+                              int lastpos)
        {
        int n;
        X509_EXTENSION *ex;
@@ -107,56 +111,57 @@ int X509v3_get_ext_by_critical(STACK *sk, int crit, int lastpos)
        lastpos++;
        if (lastpos < 0)
                lastpos=0;
-       n=sk_num(sk);
+       n=sk_X509_EXTENSION_num(sk);
        for ( ; lastpos < n; lastpos++)
                {
-               ex=(X509_EXTENSION *)sk_value(sk,lastpos);
-               if (    (ex->critical && crit) ||
-                       (!ex->critical && !crit))
+               ex=sk_X509_EXTENSION_value(sk,lastpos);
+               if (    ((ex->critical > 0) && crit) ||
+                       (!(ex->critical <= 0) && !crit))
                        return(lastpos);
                }
        return(-1);
        }
 
-X509_EXTENSION *X509v3_get_ext(STACK *x, int loc)
+X509_EXTENSION *X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc)
        {
-       if ((x == NULL) || (sk_num(x) <= loc) || (loc < 0))
-               return(NULL);
+       if (x == NULL || sk_X509_EXTENSION_num(x) <= loc || loc < 0)
+               return NULL;
        else
-               return((X509_EXTENSION *)sk_value(x,loc));
+               return sk_X509_EXTENSION_value(x,loc);
        }
 
-X509_EXTENSION *X509v3_delete_ext(STACK *x, int loc)
+X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc)
        {
        X509_EXTENSION *ret;
 
-       if ((x == NULL) || (sk_num(x) <= loc) || (loc < 0))
+       if (x == NULL || sk_X509_EXTENSION_num(x) <= loc || loc < 0)
                return(NULL);
-       ret=(X509_EXTENSION *)sk_delete(x,loc);
+       ret=sk_X509_EXTENSION_delete(x,loc);
        return(ret);
        }
 
-STACK *X509v3_add_ext(STACK **x, X509_EXTENSION *ex, int loc)
+STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
+                                        X509_EXTENSION *ex, int loc)
        {
        X509_EXTENSION *new_ex=NULL;
        int n;
-       STACK *sk=NULL;
+       STACK_OF(X509_EXTENSION) *sk=NULL;
 
        if ((x != NULL) && (*x == NULL))
                {
-               if ((sk=sk_new_null()) == NULL)
+               if ((sk=sk_X509_EXTENSION_new_null()) == NULL)
                        goto err;
                }
        else
                sk= *x;
 
-       n=sk_num(sk);
+       n=sk_X509_EXTENSION_num(sk);
        if (loc > n) loc=n;
        else if (loc < 0) loc=n;
 
        if ((new_ex=X509_EXTENSION_dup(ex)) == NULL)
                goto err2;
-       if (!sk_insert(sk,(char *)new_ex,loc))
+       if (!sk_X509_EXTENSION_insert(sk,new_ex,loc))
                goto err;
        if ((x != NULL) && (*x == NULL))
                *x=sk;
@@ -165,7 +170,7 @@ err:
        X509err(X509_F_X509V3_ADD_EXT,ERR_R_MALLOC_FAILURE);
 err2:
        if (new_ex != NULL) X509_EXTENSION_free(new_ex);
-       if (sk != NULL) sk_free(sk);
+       if (sk != NULL) sk_X509_EXTENSION_free(sk);
        return(NULL);
        }
 
@@ -229,7 +234,7 @@ int X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj)
 int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit)
        {
        if (ex == NULL) return(0);
-       ex->critical=(crit)?0xFF:0;
+       ex->critical=(crit)?0xFF:-1;
        return(1);
        }
 
@@ -238,7 +243,7 @@ int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data)
        int i;
 
        if (ex == NULL) return(0);
-       i=ASN1_OCTET_STRING_set(ex->value,data->data,data->length);
+       i=M_ASN1_OCTET_STRING_set(ex->value,data->data,data->length);
        if (!i) return(0);
        return(1);
        }
@@ -258,5 +263,6 @@ ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ex)
 int X509_EXTENSION_get_critical(X509_EXTENSION *ex)
        {
        if (ex == NULL) return(0);
-       return(ex->critical);
+       if(ex->critical > 0) return 1;
+       return 0;
        }