Add new function, EVP_MD_CTX_copy() to replace frequent use of memcpy.

[openssl.git] / crypto / objects / obj_dat.c

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 86c3d38e4b1269df47ee936c7378742563b0de5c..3df5cdd97b41f843248eefd9c1a7f09fa8bab3f6 100644 (file)
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -1,5 +1,5 @@
 /* crypto/objects/obj_dat.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
@@ -57,13 +57,27 @@
  */
 
 #include <stdio.h>
+#include <ctype.h>
 #include "cryptlib.h"
 #include "lhash.h"
 #include "asn1.h"
 #include "objects.h"
 
 /* obj_dat.h is generated from objects.h by obj_dat.pl */
+#ifndef NO_OBJECT
 #include "obj_dat.h"
+#else
+/* You will have to load all the objects needed manually in the application */
+#define NUM_NID 0
+#define NUM_SN 0
+#define NUM_LN 0
+#define NUM_OBJ 0
+static unsigned char lvalues[1];
+static ASN1_OBJECT nid_objs[1];
+static ASN1_OBJECT *sn_objs[1];
+static ASN1_OBJECT *ln_objs[1];
+static ASN1_OBJECT *obj_objs[1];
+#endif
 
 #ifndef NOPROTO
 static int sn_cmp(ASN1_OBJECT **a, ASN1_OBJECT **b);
@@ -128,7 +142,7 @@ ADDED_OBJ *ca;
        default:
                abort();
                }
-       ret&=0x3fffffff;
+       ret&=0x3fffffffL;
        ret|=ca->type<<30L;
        return(ret);
        }
@@ -162,6 +176,7 @@ ADDED_OBJ *ca,*cb;
        default:
                abort();
                }
+       return(1); /* should not get here */
        }
 
 static int init_added()
@@ -176,7 +191,8 @@ ADDED_OBJ *a;
        {
        a->obj->nid=0;
        a->obj->flags|=ASN1_OBJECT_FLAG_DYNAMIC|
-                       ASN1_OBJECT_FLAG_DYNAMIC_STRINGS;
+                       ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|
+                       ASN1_OBJECT_FLAG_DYNAMIC_DATA;
        }
 
 static void cleanup2(a)
@@ -199,6 +215,7 @@ void OBJ_cleanup()
        lh_doall(added,cleanup2); /* set counters */
        lh_doall(added,cleanup3); /* free objects */
        lh_free(added);
+       added=NULL;
        }
 
 int OBJ_new_nid(num)
@@ -245,13 +262,15 @@ ASN1_OBJECT *obj;
                                Free(aop);
                        }
                }
-       o->flags&= ~(ASN1_OBJECT_FLAG_DYNAMIC|ASN1_OBJECT_FLAG_DYNAMIC_STRINGS);
+       o->flags&= ~(ASN1_OBJECT_FLAG_DYNAMIC|ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|
+                       ASN1_OBJECT_FLAG_DYNAMIC_DATA);
+
        return(o->nid);
 err:
        for (i=ADDED_DATA; i<=ADDED_NID; i++)
                if (ao[i] != NULL) Free(ao[i]);
        if (o != NULL) Free(o);
-       return(0);
+       return(NID_undef);
        }
 
 ASN1_OBJECT *OBJ_nid2obj(n)
@@ -378,18 +397,58 @@ ASN1_OBJECT *a;
        return((*op)->nid);
        }
 
-int OBJ_txt2nid(s)
+/* Convert an object name into an ASN1_OBJECT
+ * if "noname" is not set then search for short and long names first.
+ * This will convert the "dotted" form into an object: unlike OBJ_txt2nid
+ * it can be used with any objects, not just registered ones.
+ */
+
+ASN1_OBJECT *OBJ_txt2obj(s, no_name)
 char *s;
+int no_name;
        {
-       int ret;
+       int nid = NID_undef;
+       ASN1_OBJECT *op=NULL;
+       unsigned char *buf,*p;
+       int i, j;
 
-       ret=OBJ_sn2nid(s);
-       if (ret == NID_undef)
-               return(OBJ_ln2nid(s));
-       else
-               return(ret);
+       if(!no_name) {
+               if( ((nid = OBJ_sn2nid(s)) != NID_undef) ||
+                       ((nid = OBJ_ln2nid(s)) != NID_undef) ) 
+                                       return OBJ_nid2obj(nid);
+       }
+
+       /* Work out size of content octets */
+       i=a2d_ASN1_OBJECT(NULL,0,s,-1);
+       if (i <= 0) return NULL;
+       /* Work out total size */
+       j = ASN1_object_size(0,i,V_ASN1_OBJECT);
+
+       if((buf=(unsigned char *)Malloc(j)) == NULL) return NULL;
+
+       p = buf;
+       /* Write out tag+length */
+       ASN1_put_object(&p,0,i,V_ASN1_OBJECT,V_ASN1_UNIVERSAL);
+       /* Write out contents */
+       a2d_ASN1_OBJECT(p,i,s,-1);
+       
+       p=buf;
+       op=d2i_ASN1_OBJECT(NULL,&p,i);
+       Free(buf);
+       return op;
        }
 
+int OBJ_txt2nid(s)
+char *s;
+{
+       ASN1_OBJECT *obj;
+       int nid;
+       obj = OBJ_txt2obj(s, 0);
+       nid = OBJ_obj2nid(obj);
+       ASN1_OBJECT_free(obj);
+       return nid;
+}
+
 int OBJ_ln2nid(s)
 char *s;
        {
@@ -471,7 +530,56 @@ int (*cmp)();
        return(NULL);
        }
 
-int OBJ_create_and_add_object(oid,sn,ln)
+int OBJ_create_objects(in)
+BIO *in;
+       {
+       MS_STATIC char buf[512];
+       int i,num=0;
+       char *o,*s,*l=NULL;
+
+       for (;;)
+               {
+               s=o=NULL;
+               i=BIO_gets(in,buf,512);
+               if (i <= 0) return(num);
+               buf[i-1]='\0';
+               if (!isalnum(buf[0])) return(num);
+               o=s=buf;
+               while (isdigit(*s) || (*s == '.'))
+                       s++;
+               if (*s != '\0')
+                       {
+                       *(s++)='\0';
+                       while (isspace(*s))
+                               s++;
+                       if (*s == '\0')
+                               s=NULL;
+                       else
+                               {
+                               l=s;
+                               while ((*l != '\0') && !isspace(*l))
+                                       l++;
+                               if (*l != '\0')
+                                       {
+                                       *(l++)='\0';
+                                       while (isspace(*l))
+                                               l++;
+                                       if (*l == '\0') l=NULL;
+                                       }
+                               else
+                                       l=NULL;
+                               }
+                       }
+               else
+                       s=NULL;
+               if ((o == NULL) || (*o == '\0')) return(num);
+               if (!OBJ_create(o,s,l)) return(num);
+               num++;
+               }
+       /* return(num); */
+       }
+
+int OBJ_create(oid,sn,ln)
 char *oid;
 char *sn;
 char *ln;
@@ -486,7 +594,7 @@ char *ln;
 
        if ((buf=(unsigned char *)Malloc(i)) == NULL)
                {
-               OBJerr(OBJ_F_OBJ_CREATE_AND_ADD_OBJECT,OBJ_R_MALLOC_FAILURE);
+               OBJerr(OBJ_F_OBJ_CREATE,OBJ_R_MALLOC_FAILURE);
                return(0);
                }
        i=a2d_ASN1_OBJECT(buf,i,oid,-1);
@@ -499,3 +607,4 @@ err:
        Free((char *)buf);
        return(ok);
        }
+