summaryrefslogtreecommitdiffstats
path: root/crypto/objects/obj_dat.c
diff options
context:
space:
mode:
authorRalf S. Engelschall <rse@openssl.org>1998-12-21 12:00:56 +0100
committerRalf S. Engelschall <rse@openssl.org>1998-12-21 12:00:56 +0100
commitdfeab0689f69c0b4bd3480ffd37a9cacc2f17d9c (patch)
tree2f74e0cfd76a9e092548a9bf52e579aef984299b /crypto/objects/obj_dat.c
parentImport of old SSLeay release: SSLeay 0.9.0b (diff)
downloadopenssl-dfeab0689f69c0b4bd3480ffd37a9cacc2f17d9c.tar.xz
openssl-dfeab0689f69c0b4bd3480ffd37a9cacc2f17d9c.zip
Import of old SSLeay release: SSLeay 0.9.1b (unreleased)
Diffstat (limited to 'crypto/objects/obj_dat.c')
-rw-r--r--crypto/objects/obj_dat.c25
1 files changed, 21 insertions, 4 deletions
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 34866ebbd2..93424a373f 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -64,7 +64,20 @@
#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);
@@ -163,6 +176,7 @@ ADDED_OBJ *ca,*cb;
default:
abort();
}
+ return(1); /* should not get here */
}
static int init_added()
@@ -177,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)
@@ -247,7 +262,9 @@ 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++)
@@ -502,7 +519,7 @@ int OBJ_create_objects(in)
BIO *in;
{
MS_STATIC char buf[512];
- int i,num= -1;
+ int i,num=0;
char *o,*s,*l=NULL;
for (;;)
@@ -544,7 +561,7 @@ BIO *in;
if (!OBJ_create(o,s,l)) return(num);
num++;
}
- return(num);
+ /* return(num); */
}
int OBJ_create(oid,sn,ln)