Delete all the old X509V3 pack and unpack stuff and various structures and

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

diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c
index 388130b1d776c14cc70ac23611d2445b30a484c8..c8a07ff336786a2db88d6b34a4d2fd4a09c802ca 100644 (file)
--- a/crypto/x509/x509_v3.c
+++ b/crypto/x509/x509_v3.c
@@ -1,5 +1,5 @@
 /* crypto/x509/x509_v3.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -64,16 +64,6 @@
 #include "evp.h"
 #include "x509.h"
 
-#ifndef NOPROTO
-static X509_EXTENSION_METHOD *find_by_nid(int nid);
-static int xem_cmp(X509_EXTENSION_METHOD **a, X509_EXTENSION_METHOD **b);
-#else
-static X509_EXTENSION_METHOD *find_by_nid();
-static int xem_cmp();
-#endif
-
-static STACK *extensions=NULL;
-
 int X509v3_get_ext_count(x)
 STACK *x;
        {
@@ -81,59 +71,59 @@ STACK *x;
        return(sk_num(x));
        }
 
-int X509v3_get_ext_by_NID(x,nid,oldpos)
+int X509v3_get_ext_by_NID(x,nid,lastpos)
 STACK *x;
 int nid;
-int oldpos;
+int lastpos;
        {
        ASN1_OBJECT *obj;
 
        obj=OBJ_nid2obj(nid);
        if (obj == NULL) return(-2);
-       return(X509v3_get_ext_by_OBJ(x,obj,oldpos));
+       return(X509v3_get_ext_by_OBJ(x,obj,lastpos));
        }
 
-int X509v3_get_ext_by_OBJ(sk,obj,oldpos)
+int X509v3_get_ext_by_OBJ(sk,obj,lastpos)
 STACK *sk;
 ASN1_OBJECT *obj;
-int oldpos;
+int lastpos;
        {
        int n;
        X509_EXTENSION *ex;
 
        if (sk == NULL) return(-1);
-       oldpos++;
-       if (oldpos < 0)
-               oldpos=0;
+       lastpos++;
+       if (lastpos < 0)
+               lastpos=0;
        n=sk_num(sk);
-       for ( ; oldpos < n; oldpos++)
+       for ( ; lastpos < n; lastpos++)
                {
-               ex=(X509_EXTENSION *)sk_value(sk,oldpos);
+               ex=(X509_EXTENSION *)sk_value(sk,lastpos);
                if (OBJ_cmp(ex->object,obj) == 0)
-                       return(oldpos);
+                       return(lastpos);
                }
        return(-1);
        }
 
-int X509v3_get_ext_by_critical(sk,crit,oldpos)
+int X509v3_get_ext_by_critical(sk,crit,lastpos)
 STACK *sk;
 int crit;
-int oldpos;
+int lastpos;
        {
        int n;
        X509_EXTENSION *ex;
 
        if (sk == NULL) return(-1);
-       oldpos++;
-       if (oldpos < 0)
-               oldpos=0;
+       lastpos++;
+       if (lastpos < 0)
+               lastpos=0;
        n=sk_num(sk);
-       for ( ; oldpos < n; oldpos++)
+       for ( ; lastpos < n; lastpos++)
                {
-               ex=(X509_EXTENSION *)sk_value(sk,oldpos);
+               ex=(X509_EXTENSION *)sk_value(sk,lastpos);
                if (    (ex->critical && crit) ||
                        (!ex->critical && !crit))
-                       return(oldpos);
+                       return(lastpos);
                }
        return(-1);
        }
@@ -302,108 +292,3 @@ X509_EXTENSION *ex;
        if (ex == NULL) return(0);
        return(ex->critical);
        }
-
-int X509v3_data_type_by_OBJ(obj)
-ASN1_OBJECT *obj;
-       {
-       int nid;
-
-       nid=OBJ_obj2nid(obj);
-       if (nid == V_ASN1_UNDEF) return(V_ASN1_UNDEF);
-       return(X509v3_data_type_by_NID(nid));
-       }
-
-int X509v3_data_type_by_NID(nid)
-int nid;
-       {
-       X509_EXTENSION_METHOD *x;
-
-       x=find_by_nid(nid);
-       if (x == NULL)
-               return(V_ASN1_UNDEF);
-       else
-               return(x->data_type);
-       }
-
-int X509v3_pack_type_by_OBJ(obj)
-ASN1_OBJECT *obj;
-       {
-       int nid;
-
-       nid=OBJ_obj2nid(obj);
-       if (nid == NID_undef) return(X509_EXT_PACK_UNKNOWN);
-       return(X509v3_pack_type_by_NID(nid));
-       }
-
-int X509v3_pack_type_by_NID(nid)
-int nid;
-       {
-       X509_EXTENSION_METHOD *x;
-
-       x=find_by_nid(nid);
-       if (x == NULL)
-               return(X509_EXT_PACK_UNKNOWN);
-       else
-               return(x->pack_type);
-       }
-
-static X509_EXTENSION_METHOD *find_by_nid(nid)
-int nid;
-       {
-       X509_EXTENSION_METHOD x;
-       int i;
-
-       x.nid=nid;
-       if (extensions == NULL) return(NULL);
-       i=sk_find(extensions,(char *)&x);
-       if (i < 0)
-               return(NULL);
-       else
-               return((X509_EXTENSION_METHOD *)sk_value(extensions,i));
-       }
-
-static int xem_cmp(a,b)
-X509_EXTENSION_METHOD **a,**b;
-       {
-       return((*a)->nid-(*b)->nid);
-       }
-
-void X509v3_cleanup_extensions()
-       {
-       int i;
-
-       if (extensions != NULL)
-               {
-               for (i=0; i<sk_num(extensions); i++)
-                       Free(sk_value(extensions,i));
-               sk_free(extensions);
-               extensions=NULL;
-               }
-       }
-
-int X509v3_add_extension(x)
-X509_EXTENSION_METHOD *x;
-       {
-       X509_EXTENSION_METHOD *newx;
-
-       if (extensions == NULL)
-               {
-               extensions=sk_new(xem_cmp);
-               if (extensions == NULL) goto err;
-               }
-       newx=(X509_EXTENSION_METHOD *)Malloc(sizeof(X509_EXTENSION_METHOD));
-       if (newx == NULL) goto err;
-       newx->nid=x->nid;
-       newx->data_type=x->data_type;
-       newx->pack_type=x->pack_type;
-       if (!sk_push(extensions,(char *)newx))
-               {
-               Free(newx);
-               goto err;
-               }
-       return(1);
-err:
-       X509err(X509_F_X509V3_ADD_EXTENSION,ERR_R_MALLOC_FAILURE);
-       return(0);
-       }
-