Commit c2bbf9cf authored by Richard Levitte's avatar Richard Levitte
Browse files

I got sick and tired of having to keep track of NIDs when such a thing 

could be done automagically, much like the numbering in libeay.num and
ssleay.num.  The solution works as follows:

  - New object identifiers are inserted in objects.txt, following the
    syntax given in objects.README.
  - objects.pl is used to process obj_mac.num and create a new
    obj_mac.h.
  - obj_dat.pl is used to create a new obj_dat.h, using the data in
    obj_mac.h.

This is currently kind of a hack, and the perl code in objects.pl
isn't very elegant, but it works as I intended.  The simplest way to
check that it worked correctly is to look in obj_dat.h and check the
array nid_objs and make sure the objects haven't moved around (this is
important!).  Additions are OK, as well as consistent name changes.
parent 8f0d68fa

Makefile.org

+4 −2
Original line number Diff line number Diff line
@@ -308,8 +308,10 @@ util/libeay.num:: 
util/ssleay.num::

	perl util/mkdef.pl ssl update



crypto/objects/obj_dat.h: crypto/objects/objects.h crypto/objects/obj_dat.pl

	perl crypto/objects/obj_dat.pl crypto/objects/objects.h crypto/objects/obj_dat.h

crypto/objects/obj_dat.h: crypto/objects/obj_mac.h crypto/objects/obj_dat.pl

	perl crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h

crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt 

	perl crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h



TABLE: Configure

	(echo 'Output of `Configure TABLE'"':"; \

apps/Makefile.ssl

+366 −346

File changed.

Preview size limit exceeded, changes collapsed.

crypto/asn1/Makefile.ssl

+320 −302

File changed.

Preview size limit exceeded, changes collapsed.

crypto/bio/Makefile.ssl

+22 −21
Original line number Diff line number Diff line
@@ -113,13 +113,13 @@ bf_buff.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h 
bf_buff.o: ../../include/openssl/err.h ../../include/openssl/evp.h

bf_buff.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h

bf_buff.o: ../../include/openssl/md2.h ../../include/openssl/md5.h

bf_buff.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h

bf_buff.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

bf_buff.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

bf_buff.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

bf_buff.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

bf_buff.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

bf_buff.o: ../cryptlib.h

bf_buff.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h

bf_buff.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

bf_buff.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h

bf_buff.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h

bf_buff.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h

bf_buff.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

bf_buff.o: ../../include/openssl/stack.h ../cryptlib.h

bf_nbio.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

bf_nbio.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h

bf_nbio.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -129,13 +129,14 @@ bf_nbio.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h 
bf_nbio.o: ../../include/openssl/err.h ../../include/openssl/evp.h

bf_nbio.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h

bf_nbio.o: ../../include/openssl/md2.h ../../include/openssl/md5.h

bf_nbio.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h

bf_nbio.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

bf_nbio.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h

bf_nbio.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h

bf_nbio.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h

bf_nbio.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

bf_nbio.o: ../../include/openssl/stack.h ../cryptlib.h

bf_nbio.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h

bf_nbio.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

bf_nbio.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h

bf_nbio.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

bf_nbio.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

bf_nbio.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

bf_nbio.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

bf_nbio.o: ../cryptlib.h

bf_null.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

bf_null.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h

bf_null.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -145,13 +146,13 @@ bf_null.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h 
bf_null.o: ../../include/openssl/err.h ../../include/openssl/evp.h

bf_null.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h

bf_null.o: ../../include/openssl/md2.h ../../include/openssl/md5.h

bf_null.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h

bf_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

bf_null.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

bf_null.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

bf_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

bf_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

bf_null.o: ../cryptlib.h

bf_null.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h

bf_null.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

bf_null.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h

bf_null.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h

bf_null.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h

bf_null.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

bf_null.o: ../../include/openssl/stack.h ../cryptlib.h

bio_cb.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h

bio_cb.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h

bio_cb.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

crypto/comp/Makefile.ssl

+10 −8
Original line number Diff line number Diff line
@@ -83,17 +83,19 @@ clean: 


c_rle.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

c_rle.o: ../../include/openssl/bn.h ../../include/openssl/comp.h

c_rle.o: ../../include/openssl/crypto.h ../../include/openssl/objects.h

c_rle.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

c_rle.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

c_rle.o: ../../include/openssl/crypto.h ../../include/openssl/obj_mac.h

c_rle.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

c_rle.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

c_rle.o: ../../include/openssl/stack.h

c_zlib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

c_zlib.o: ../../include/openssl/bn.h ../../include/openssl/comp.h

c_zlib.o: ../../include/openssl/crypto.h ../../include/openssl/objects.h

c_zlib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

c_zlib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

c_zlib.o: ../../include/openssl/crypto.h ../../include/openssl/obj_mac.h

c_zlib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

c_zlib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

c_zlib.o: ../../include/openssl/stack.h

comp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

comp_lib.o: ../../include/openssl/bn.h ../../include/openssl/comp.h

comp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/objects.h

comp_lib.o: ../../include/openssl/opensslconf.h

comp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/obj_mac.h

comp_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

comp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

comp_lib.o: ../../include/openssl/stack.h