5 files changed, 172 insertions, 87 deletions

diff --git a/src/lib/libcrypto/objects/Makefile.ssl b/src/lib/libcrypto/objects/Makefile.ssl
index 53450f8754..f05e15df96 100644
--- a/src/lib/libcrypto/objects/Makefile.ssl
+++ b/src/lib/libcrypto/objects/Makefile.ssl
@@ -37,9 +37,6 @@ top:
 
 all:    obj_dat.h lib
 
-obj_dat.h: objects.h obj_dat.pl
-        $(PERL) ./obj_dat.pl < objects.h > obj_dat.h
-
 lib:    $(LIBOBJ)
         $(AR) $(LIB) $(LIBOBJ)
         $(RANLIB) $(LIB)
diff --git a/src/lib/libcrypto/objects/o_names.c b/src/lib/libcrypto/objects/o_names.c
index 4da5e45b9c..d654eb220e 100644
--- a/src/lib/libcrypto/objects/o_names.c
+++ b/src/lib/libcrypto/objects/o_names.c
@@ -4,15 +4,25 @@
 
 #include <openssl/lhash.h>
 #include <openssl/objects.h>
+#include <openssl/safestack.h>
 
 /* I use the ex_data stuff to manage the identifiers for the obj_name_types
  * that applications may define.  I only really use the free function field.
  */
 static LHASH *names_lh=NULL;
 static int names_type_num=OBJ_NAME_TYPE_NUM;
-static STACK *names_cmp=NULL;
-static STACK *names_hash=NULL;
-static STACK *names_free=NULL;
+
+typedef struct name_funcs_st
+        {
+        unsigned long (*hash_func)();
+        int (*cmp_func)();
+        void (*free_func)();
+        } NAME_FUNCS;
+
+DECLARE_STACK_OF(NAME_FUNCS)
+IMPLEMENT_STACK_OF(NAME_FUNCS)
+
+STACK_OF(NAME_FUNCS) *name_funcs_stack;
 
 static unsigned long obj_name_hash(OBJ_NAME *a);
 static int obj_name_cmp(OBJ_NAME *a,OBJ_NAME *b);
@@ -31,51 +41,57 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(), int (*cmp_func)(),
         {
         int ret;
         int i;
+        NAME_FUNCS *name_funcs;
 
-        if (names_free == NULL)
+        if (name_funcs_stack == NULL)
                 {
                 MemCheck_off();
-                names_hash=sk_new_null();
-                names_cmp=sk_new_null();
-                names_free=sk_new_null();
+                name_funcs_stack=sk_NAME_FUNCS_new_null();
                 MemCheck_on();
                 }
-        if ((names_free == NULL) || (names_hash == NULL) || (names_cmp == NULL))
+        if ((name_funcs_stack == NULL))
                 {
                 /* ERROR */
                 return(0);
                 }
         ret=names_type_num;
         names_type_num++;
-        for (i=sk_num(names_free); i<names_type_num; i++)
+        for (i=sk_NAME_FUNCS_num(name_funcs_stack); i<names_type_num; i++)
                 {
                 MemCheck_off();
-                sk_push(names_hash,(char *)strcmp);
-                sk_push(names_cmp,(char *)lh_strhash);
-                sk_push(names_free,NULL);
+                name_funcs = Malloc(sizeof(NAME_FUNCS));
+                name_funcs->hash_func = lh_strhash;
+                name_funcs->cmp_func = (int (*)())strcmp;
+                name_funcs->free_func = 0; /* NULL is often declared to
+                                            * ((void *)0), which according
+                                            * to Compaq C is not really
+                                            * compatible with a function
+                                            * pointer.  -- Richard Levitte*/
+                sk_NAME_FUNCS_push(name_funcs_stack,name_funcs);
                 MemCheck_on();
                 }
+        name_funcs = sk_NAME_FUNCS_value(name_funcs_stack, ret);
         if (hash_func != NULL)
-                sk_set(names_hash,ret,(char *)hash_func);
+                name_funcs->hash_func = hash_func;
         if (cmp_func != NULL)
-                sk_set(names_cmp,ret,(char *)cmp_func);
+                name_funcs->cmp_func = cmp_func;
         if (free_func != NULL)
-                sk_set(names_free,ret,(char *)free_func);
+                name_funcs->free_func = free_func;
         return(ret);
         }
 
 static int obj_name_cmp(OBJ_NAME *a, OBJ_NAME *b)
         {
         int ret;
-        int (*cmp)();
 
         ret=a->type-b->type;
         if (ret == 0)
                 {
-                if ((names_cmp != NULL) && (sk_num(names_cmp) > a->type))
+                if ((name_funcs_stack != NULL)
+                        && (sk_NAME_FUNCS_num(name_funcs_stack) > a->type))
                         {
-                        cmp=(int (*)())sk_value(names_cmp,a->type);
-                        ret=cmp(a->name,b->name);
+                        ret=sk_NAME_FUNCS_value(name_funcs_stack,a->type)
+                                ->cmp_func(a->name,b->name);
                         }
                 else
                         ret=strcmp(a->name,b->name);
@@ -86,12 +102,11 @@ static int obj_name_cmp(OBJ_NAME *a, OBJ_NAME *b)
 static unsigned long obj_name_hash(OBJ_NAME *a)
         {
         unsigned long ret;
-        unsigned long (*hash)();
 
-        if ((names_hash != NULL) && (sk_num(names_hash) > a->type))
+        if ((name_funcs_stack != NULL) && (sk_NAME_FUNCS_num(name_funcs_stack) > a->type))
                 {
-                hash=(unsigned long (*)())sk_value(names_hash,a->type);
-                ret=hash(a->name);
+                ret=sk_NAME_FUNCS_value(name_funcs_stack,a->type)
+                        ->hash_func(a->name);
                 }
         else
                 {
@@ -117,7 +132,7 @@ const char *OBJ_NAME_get(const char *name, int type)
 
         for (;;)
                 {
-                ret=(OBJ_NAME *)lh_retrieve(names_lh,(char *)&on);
+                ret=(OBJ_NAME *)lh_retrieve(names_lh,&on);
                 if (ret == NULL) return(NULL);
                 if ((ret->alias) && !alias)
                         {
@@ -133,7 +148,6 @@ const char *OBJ_NAME_get(const char *name, int type)
 
 int OBJ_NAME_add(const char *name, int type, const char *data)
         {
-        void (*f)();
         OBJ_NAME *onp,*ret;
         int alias;
 
@@ -154,16 +168,20 @@ int OBJ_NAME_add(const char *name, int type, const char *data)
         onp->type=type;
         onp->data=data;
 
-        ret=(OBJ_NAME *)lh_insert(names_lh,(char *)onp);
+        ret=(OBJ_NAME *)lh_insert(names_lh,onp);
         if (ret != NULL)
                 {
                 /* free things */
-                if ((names_free != NULL) && (sk_num(names_free) > ret->type))
+                if ((name_funcs_stack != NULL) && (sk_NAME_FUNCS_num(name_funcs_stack) > ret->type))
                         {
-                        f=(void (*)())sk_value(names_free,ret->type);
-                        f(ret->name,ret->type,ret->data);
+                        /* XXX: I'm not sure I understand why the free
+                         * function should get three arguments...
+                         * -- Richard Levitte
+                         */
+                        sk_NAME_FUNCS_value(name_funcs_stack,ret->type)
+                                ->free_func(ret->name,ret->type,ret->data);
                         }
-                Free((char *)ret);
+                Free(ret);
                 }
         else
                 {
@@ -179,23 +197,26 @@ int OBJ_NAME_add(const char *name, int type, const char *data)
 int OBJ_NAME_remove(const char *name, int type)
         {
         OBJ_NAME on,*ret;
-        void (*f)();
 
         if (names_lh == NULL) return(0);
 
         type&= ~OBJ_NAME_ALIAS;
         on.name=name;
         on.type=type;
-        ret=(OBJ_NAME *)lh_delete(names_lh,(char *)&on);
+        ret=(OBJ_NAME *)lh_delete(names_lh,&on);
         if (ret != NULL)
                 {
                 /* free things */
-                if ((names_free != NULL) && (sk_num(names_free) > type))
+                if ((name_funcs_stack != NULL) && (sk_NAME_FUNCS_num(name_funcs_stack) > ret->type))
                         {
-                        f=(void (*)())sk_value(names_free,type);
-                        f(ret->name,ret->type,ret->data);
+                        /* XXX: I'm not sure I understand why the free
+                         * function should get three arguments...
+                         * -- Richard Levitte
+                         */
+                        sk_NAME_FUNCS_value(name_funcs_stack,ret->type)
+                                ->free_func(ret->name,ret->type,ret->data);
                         }
-                Free((char *)ret);
+                Free(ret);
                 return(1);
                 }
         else
@@ -215,6 +236,11 @@ static void names_lh_free(OBJ_NAME *onp, int type)
                 }
         }
 
+static void name_funcs_free(NAME_FUNCS *ptr)
+        {
+        Free(ptr);
+        }
+
 void OBJ_NAME_cleanup(int type)
         {
         unsigned long down_load;
@@ -229,13 +255,9 @@ void OBJ_NAME_cleanup(int type)
         if (type < 0)
                 {
                 lh_free(names_lh);
-                sk_free(names_hash);
-                sk_free(names_cmp);
-                sk_free(names_free);
+                sk_NAME_FUNCS_pop_free(name_funcs_stack,name_funcs_free);
                 names_lh=NULL;
-                names_hash=NULL;
-                names_cmp=NULL;
-                names_free=NULL;
+                name_funcs_stack = NULL;
                 }
         else
                 names_lh->down_load=down_load;
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c
index d47b874399..da6df3762a 100644
--- a/src/lib/libcrypto/objects/obj_dat.c
+++ b/src/lib/libcrypto/objects/obj_dat.c
@@ -214,16 +214,12 @@ int OBJ_new_nid(int num)
 int OBJ_add_object(ASN1_OBJECT *obj)
         {
         ASN1_OBJECT *o;
-        ADDED_OBJ *ao[4],*aop;
+        ADDED_OBJ *ao[4]={NULL,NULL,NULL,NULL},*aop;
         int i;
 
         if (added == NULL)
                 if (!init_added()) return(0);
         if ((o=OBJ_dup(obj)) == NULL) goto err;
-        ao[ADDED_DATA]=NULL;
-        ao[ADDED_SNAME]=NULL;
-        ao[ADDED_LNAME]=NULL;
-        ao[ADDED_NID]=NULL;
         ao[ADDED_NID]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));
         if ((o->length != 0) && (obj->data != NULL))
                 ao[ADDED_DATA]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));
@@ -238,7 +234,7 @@ int OBJ_add_object(ASN1_OBJECT *obj)
                         {
                         ao[i]->type=i;
                         ao[i]->obj=o;
-                        aop=(ADDED_OBJ *)lh_insert(added,(char *)ao[i]);
+                        aop=(ADDED_OBJ *)lh_insert(added,ao[i]);
                         /* memory leak, buit should not normally matter */
                         if (aop != NULL)
                                 Free(aop);
@@ -276,7 +272,7 @@ ASN1_OBJECT *OBJ_nid2obj(int n)
                 ad.type=ADDED_NID;
                 ad.obj= &ob;
                 ob.nid=n;
-                adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
+                adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
                 if (adp != NULL)
                         return(adp->obj);
                 else
@@ -308,7 +304,7 @@ const char *OBJ_nid2sn(int n)
                 ad.type=ADDED_NID;
                 ad.obj= &ob;
                 ob.nid=n;
-                adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
+                adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
                 if (adp != NULL)
                         return(adp->obj->sn);
                 else
@@ -340,7 +336,7 @@ const char *OBJ_nid2ln(int n)
                 ad.type=ADDED_NID;
                 ad.obj= &ob;
                 ob.nid=n;
-                adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
+                adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
                 if (adp != NULL)
                         return(adp->obj->ln);
                 else
@@ -365,7 +361,7 @@ int OBJ_obj2nid(ASN1_OBJECT *a)
                 {
                 ad.type=ADDED_DATA;
                 ad.obj=a;
-                adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
+                adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
                 if (adp != NULL) return (adp->obj->nid);
                 }
         op=(ASN1_OBJECT **)OBJ_bsearch((char *)&a,(char *)obj_objs,NUM_OBJ,
@@ -504,7 +500,7 @@ int OBJ_ln2nid(const char *s)
                 {
                 ad.type=ADDED_LNAME;
                 ad.obj= &o;
-                adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
+                adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
                 if (adp != NULL) return (adp->obj->nid);
                 }
         op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)ln_objs,NUM_LN,
@@ -523,7 +519,7 @@ int OBJ_sn2nid(const char *s)
                 {
                 ad.type=ADDED_SNAME;
                 ad.obj= &o;
-                adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
+                adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
                 if (adp != NULL) return (adp->obj->nid);
                 }
         op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)sn_objs,NUM_SN,
@@ -647,7 +643,7 @@ int OBJ_create(char *oid, char *sn, char *ln)
         ok=OBJ_add_object(op);
 err:
         ASN1_OBJECT_free(op);
-        Free((char *)buf);
+        Free(buf);
         return(ok);
         }
 
diff --git a/src/lib/libcrypto/objects/obj_dat.pl b/src/lib/libcrypto/objects/obj_dat.pl
index 5043daef2a..e6e3c3b9c0 100644
--- a/src/lib/libcrypto/objects/obj_dat.pl
+++ b/src/lib/libcrypto/objects/obj_dat.pl
@@ -38,7 +38,10 @@ sub expand_obj
         return(%objn);
         }
 
-while (<>)
+open (IN,"$ARGV[0]") || die "Can't open input file $ARGV[0]";
+open (OUT,">$ARGV[1]") || die "Can't open output file $ARGV[1]";
+
+while (<IN>)
         {
         next unless /^\#define\s+(\S+)\s+(.*)$/;
         $v=$1;
@@ -55,6 +58,7 @@ while (<>)
                 $objd{$v}=$d;
                 }
         }
+close IN;
 
 %ob=&expand_obj(*objd);
 
@@ -132,7 +136,7 @@ foreach (sort obj_cmp @a)
         push(@ob,sprintf("&(nid_objs[%2d]),/* %-32s %s */\n",$_,$m,$v));
         }
 
-print <<'EOF';
+print OUT <<'EOF';
 /* lib/obj/obj_dat.h */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
@@ -193,21 +197,21 @@ print <<'EOF';
 
 /* THIS FILE IS GENERATED FROM Objects.h by obj_dat.pl via the
  * following command:
- * perl obj_dat.pl < objects.h > obj_dat.h
+ * perl obj_dat.pl objects.h obj_dat.h
  */
 
 EOF
 
-printf "#define NUM_NID %d\n",$n;
-printf "#define NUM_SN %d\n",$#sn+1;
-printf "#define NUM_LN %d\n",$#ln+1;
-printf "#define NUM_OBJ %d\n\n",$#ob+1;
+printf OUT "#define NUM_NID %d\n",$n;
+printf OUT "#define NUM_SN %d\n",$#sn+1;
+printf OUT "#define NUM_LN %d\n",$#ln+1;
+printf OUT "#define NUM_OBJ %d\n\n",$#ob+1;
 
-printf "static unsigned char lvalues[%d]={\n",$lvalues+1;
-print @lvalues;
-print "};\n\n";
+printf OUT "static unsigned char lvalues[%d]={\n",$lvalues+1;
+print OUT @lvalues;
+print OUT "};\n\n";
 
-printf "static ASN1_OBJECT nid_objs[NUM_NID]={\n";
+printf OUT "static ASN1_OBJECT nid_objs[NUM_NID]={\n";
 foreach (@out)
         {
         if (length($_) > 75)
@@ -218,30 +222,32 @@ foreach (@out)
                         $t=$out.$_.",";
                         if (length($t) > 70)
                                 {
-                                print "$out\n";
+                                print OUT "$out\n";
                                 $t="\t$_,";
                                 }
                         $out=$t;
                         }
                 chop $out;
-                print "$out";
+                print OUT "$out";
                 }
         else
-                { print $_; }
+                { print OUT $_; }
         }
-print  "};\n\n";
+print  OUT "};\n\n";
+
+printf OUT "static ASN1_OBJECT *sn_objs[NUM_SN]={\n";
+print  OUT @sn;
+print  OUT "};\n\n";
 
-printf "static ASN1_OBJECT *sn_objs[NUM_SN]={\n";
-print  @sn;
-print  "};\n\n";
+printf OUT "static ASN1_OBJECT *ln_objs[NUM_LN]={\n";
+print  OUT @ln;
+print  OUT "};\n\n";
 
-printf "static ASN1_OBJECT *ln_objs[NUM_LN]={\n";
-print  @ln;
-print  "};\n\n";
+printf OUT "static ASN1_OBJECT *obj_objs[NUM_OBJ]={\n";
+print  OUT @ob;
+print  OUT "};\n\n";
 
-printf "static ASN1_OBJECT *obj_objs[NUM_OBJ]={\n";
-print  @ob;
-print  "};\n\n";
+close OUT;
 
 sub der_it
         {
diff --git a/src/lib/libcrypto/objects/objects.h b/src/lib/libcrypto/objects/objects.h
index d03748e022..d1a5ad2502 100644
--- a/src/lib/libcrypto/objects/objects.h
+++ b/src/lib/libcrypto/objects/objects.h
@@ -110,10 +110,12 @@ extern "C" {
 #define NID_md5WithRSAEncryption        8
 #define OBJ_md5WithRSAEncryption        OBJ_pkcs,1L,4L
 
+#define SN_pbeWithMD2AndDES_CBC         "PBE-MD2-DES"
 #define LN_pbeWithMD2AndDES_CBC         "pbeWithMD2AndDES-CBC"
 #define NID_pbeWithMD2AndDES_CBC        9
 #define OBJ_pbeWithMD2AndDES_CBC        OBJ_pkcs,5L,1L
 
+#define SN_pbeWithMD5AndDES_CBC         "PBE-MD5-DES"
 #define LN_pbeWithMD5AndDES_CBC         "pbeWithMD5AndDES-CBC"
 #define NID_pbeWithMD5AndDES_CBC        10
 #define OBJ_pbeWithMD5AndDES_CBC        OBJ_pkcs,5L,3L
@@ -230,6 +232,7 @@ extern "C" {
 #define SN_idea_cbc                     "IDEA-CBC"
 #define LN_idea_cbc                     "idea-cbc"
 #define NID_idea_cbc                    34
+#define OBJ_idea_cbc                    1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
 
 #define SN_idea_cfb64                   "IDEA-CFB"
 #define LN_idea_cfb64                   "idea-cfb"
@@ -380,6 +383,7 @@ extern "C" {
 #define OBJ_dsa_2                       OBJ_algorithm,12L
 
 /* proposed by microsoft to RSA */
+#define SN_pbeWithSHA1AndRC2_CBC        "PBE-SHA1-RC2-64"
 #define LN_pbeWithSHA1AndRC2_CBC        "pbeWithSHA1AndRC2-CBC"
 #define NID_pbeWithSHA1AndRC2_CBC       68
 #define OBJ_pbeWithSHA1AndRC2_CBC       OBJ_pkcs,5L,11L 
@@ -499,6 +503,7 @@ extern "C" {
 #define SN_bf_cbc                       "BF-CBC"
 #define LN_bf_cbc                       "bf-cbc"
 #define NID_bf_cbc                      91
+#define OBJ_bf_cbc                      1L,3L,6L,1L,4L,1L,3029L,1L,2L
 
 #define SN_bf_ecb                       "BF-ECB"
 #define LN_bf_ecb                       "bf-ecb"
@@ -627,7 +632,7 @@ extern "C" {
 #define OBJ_ripemd160                   1L,3L,36L,3L,2L,1L
 
 /* The name should actually be rsaSignatureWithripemd160, but I'm going
- * to contiune using the convention I'm using with the other ciphers */
+ * to continue using the convention I'm using with the other ciphers */
 #define SN_ripemd160WithRSA             "RSA-RIPEMD160"
 #define LN_ripemd160WithRSA             "ripemd160WithRSA"
 #define NID_ripemd160WithRSA            119
@@ -661,12 +666,12 @@ extern "C" {
 #define SN_rle_compression              "RLE"
 #define LN_rle_compression              "run length compression"
 #define NID_rle_compression             124
-#define OBJ_rle_compression             1L,1L,1L,1L,666L.1L
+#define OBJ_rle_compression             1L,1L,1L,1L,666L,1L
 
 #define SN_zlib_compression             "ZLIB"
 #define LN_zlib_compression             "zlib compression"
 #define NID_zlib_compression            125
-#define OBJ_zlib_compression            1L,1L,1L,1L,666L.2L
+#define OBJ_zlib_compression            1L,1L,1L,1L,666L,2L
 
 #define SN_ext_key_usage                "extendedKeyUsage"
 #define LN_ext_key_usage                "X509v3 Extended Key Usage"
@@ -735,7 +740,7 @@ extern "C" {
 #define NID_ms_efs                      138
 #define OBJ_ms_efs                      1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
 
-/* Addidional usage: Netscape */
+/* Additional usage: Netscape */
 
 #define SN_ns_sgc                       "nsSGC"
 #define LN_ns_sgc                       "Netscape Server Gated Crypto"
@@ -767,26 +772,32 @@ extern "C" {
 #define OBJ_pkcs12                      OBJ_pkcs,12L
 #define OBJ_pkcs12_pbeids               OBJ_pkcs12, 1
 
+#define SN_pbe_WithSHA1And128BitRC4     "PBE-SHA1-RC4-128"
 #define LN_pbe_WithSHA1And128BitRC4     "pbeWithSHA1And128BitRC4"
 #define NID_pbe_WithSHA1And128BitRC4    144
 #define OBJ_pbe_WithSHA1And128BitRC4    OBJ_pkcs12_pbeids, 1L
 
+#define SN_pbe_WithSHA1And40BitRC4      "PBE-SHA1-RC4-40"
 #define LN_pbe_WithSHA1And40BitRC4      "pbeWithSHA1And40BitRC4"
 #define NID_pbe_WithSHA1And40BitRC4     145
 #define OBJ_pbe_WithSHA1And40BitRC4     OBJ_pkcs12_pbeids, 2L
 
+#define SN_pbe_WithSHA1And3_Key_TripleDES_CBC   "PBE-SHA1-3DES"
 #define LN_pbe_WithSHA1And3_Key_TripleDES_CBC   "pbeWithSHA1And3-KeyTripleDES-CBC"
 #define NID_pbe_WithSHA1And3_Key_TripleDES_CBC  146
 #define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC  OBJ_pkcs12_pbeids, 3L
 
+#define SN_pbe_WithSHA1And2_Key_TripleDES_CBC   "PBE-SHA1-2DES"
 #define LN_pbe_WithSHA1And2_Key_TripleDES_CBC   "pbeWithSHA1And2-KeyTripleDES-CBC"
 #define NID_pbe_WithSHA1And2_Key_TripleDES_CBC  147
 #define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC  OBJ_pkcs12_pbeids, 4L
 
+#define SN_pbe_WithSHA1And128BitRC2_CBC         "PBE-SHA1-RC2-128"
 #define LN_pbe_WithSHA1And128BitRC2_CBC         "pbeWithSHA1And128BitRC2-CBC"
 #define NID_pbe_WithSHA1And128BitRC2_CBC        148
 #define OBJ_pbe_WithSHA1And128BitRC2_CBC        OBJ_pkcs12_pbeids, 5L
 
+#define SN_pbe_WithSHA1And40BitRC2_CBC  "PBE-SHA1-RC2-40"
 #define LN_pbe_WithSHA1And40BitRC2_CBC  "pbeWithSHA1And40BitRC2-CBC"
 #define NID_pbe_WithSHA1And40BitRC2_CBC 149
 #define OBJ_pbe_WithSHA1And40BitRC2_CBC OBJ_pkcs12_pbeids, 6L
@@ -876,20 +887,73 @@ extern "C" {
 #define SN_SMIMECapabilities            "SMIME-CAPS"
 #define LN_SMIMECapabilities            "S/MIME Capabilities"
 #define NID_SMIMECapabilities           167
-#define OBJ_SMIMECapabilities           OBJ_id_pkcs9,15L
+#define OBJ_SMIMECapabilities           OBJ_pkcs9,15L
 
+#define SN_pbeWithMD2AndRC2_CBC         "PBE-MD2-RC2-64"
 #define LN_pbeWithMD2AndRC2_CBC         "pbeWithMD2AndRC2-CBC"
 #define NID_pbeWithMD2AndRC2_CBC        168
 #define OBJ_pbeWithMD2AndRC2_CBC        OBJ_pkcs,5L,4L
 
+#define SN_pbeWithMD5AndRC2_CBC         "PBE-MD5-RC2-64"
 #define LN_pbeWithMD5AndRC2_CBC         "pbeWithMD5AndRC2-CBC"
 #define NID_pbeWithMD5AndRC2_CBC        169
 #define OBJ_pbeWithMD5AndRC2_CBC        OBJ_pkcs,5L,6L
 
+#define SN_pbeWithSHA1AndDES_CBC        "PBE-SHA1-DES"
 #define LN_pbeWithSHA1AndDES_CBC        "pbeWithSHA1AndDES-CBC"
 #define NID_pbeWithSHA1AndDES_CBC       170
 #define OBJ_pbeWithSHA1AndDES_CBC       OBJ_pkcs,5L,10L
 
+/* Extension request OIDs */
+
+#define LN_ms_ext_req                   "Microsoft Extension Request"
+#define SN_ms_ext_req                   "msExtReq"
+#define NID_ms_ext_req                  171
+#define OBJ_ms_ext_req                  1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
+
+#define LN_ext_req                      "Extension Request"
+#define SN_ext_req                      "extReq"
+#define NID_ext_req                     172
+#define OBJ_ext_req                     OBJ_pkcs9,14L
+
+#define SN_name                         "name"
+#define LN_name                         "name"
+#define NID_name                        173
+#define OBJ_name                        OBJ_X509,41L
+
+#define SN_dnQualifier                  "dnQualifier"
+#define LN_dnQualifier                  "dnQualifier"
+#define NID_dnQualifier                 174
+#define OBJ_dnQualifier                 OBJ_X509,46L
+
+#define SN_id_pe                        "id-pe"
+#define NID_id_pe                       175
+#define OBJ_id_pe                       OBJ_id_pkix,1L
+
+#define SN_id_ad                        "id-ad"
+#define NID_id_ad                       176
+#define OBJ_id_ad                       OBJ_id_pkix,48L
+
+#define SN_info_access                  "authorityInfoAccess"
+#define LN_info_access                  "Authority Information Access"
+#define NID_info_access                 177
+#define OBJ_info_access                 OBJ_id_pe,1L
+
+#define SN_ad_OCSP                      "OCSP"
+#define LN_ad_OCSP                      "OCSP"
+#define NID_ad_OCSP                     178
+#define OBJ_ad_OCSP                     OBJ_id_ad,1L
+
+#define SN_ad_ca_issuers                "caIssuers"
+#define LN_ad_ca_issuers                "CA Issuers"
+#define NID_ad_ca_issuers               179
+#define OBJ_ad_ca_issuers               OBJ_id_ad,2L
+
+#define SN_OSCP_sign                    "OCSPSigning"
+#define LN_OCSP_sign                    "OCSP Signing"
+#define NID_OCSP_sign                   180
+#define OBJ_OCSP_sign                   OBJ_id_kp,9L
+
 #include <openssl/bio.h>
 #include <openssl/asn1.h>