Commit 6c8abdd7 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

New err_code.pl script to retain old error codes. This should allow the use 

of 'make errors' without causing huge re-organisations of files when a new
code is added.
parent 4a66b7e0

CHANGES

+10 −0
Original line number Diff line number Diff line
@@ -5,6 +5,16 @@ 


 Changes between 0.9.1c and 0.9.2



  *) Changes to the error generation code. The perl script err-code.pl 

     now reads in the old error codes and retains the old numbers, only

     adding new ones if necessary. It also only changes the .err files if new

     codes are added. The makefiles have been modified to only insert errors

     when needed (to avoid needlessly modifying header files). This is done

     by only inserting errors if the .err file is newer than the auto generated

     C file. To rebuild all the error codes from scratch (the old behaviour)

     either modify crypto/Makefile.ssl to pass the -regen flag to err_code.pl

     or delete all the .err files.



  *) CAST-128 was incorrectly implemented for short keys. The C version has

     been fixed, but is untested. The assembler versions are also fixed, but

     new assembler HAS NOT BEEN GENERATED FOR WIN32 - the Makefile needs fixing

crypto/Makefile.ssl

+7 −6
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ MAKEFILE= Makefile.ssl 
RM=             /bin/rm -f

AR=		ar r



MAKE=		make -f Makefile.ssl

MAKEDEPEND=	makedepend -f Makefile.ssl

MAKEFILE=	Makefile.ssl



PEX_LIBS=

EX_LIBS=
@@ -148,14 +144,19 @@ dclean: 
	$(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \

	done;



errors:

	perl ./err/err_code.pl -conf err/ssleay.ec *.c */*.c ../ssl/*.c ../rsaref/*.c

errors: errgen $(ERRC).c



$(ERRC).c: $(ERR).err

	perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h

	perl err/err_genc.pl -s $(ERR).h $(ERRC).c



errgen:

	perl ./err/err_code.pl -conf err/ssleay.ec *.c */*.c ../ssl/*.c ../rsaref/*.c

	@for i in $(SDIRS) ;\

	do \

	(cd $$i; echo "making errors in $$i..."; \

	$(MAKE) errors ); \

	done;





# DO NOT DELETE THIS LINE -- make depend depends on it.

crypto/asn1/Makefile.ssl

+3 −1
Original line number Diff line number Diff line
@@ -113,7 +113,9 @@ dclean: 
clean:

	/bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff



errors:

errors: $(ERRC).c



$(ERRC).c: $(ERR).err

	perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h

	perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c

crypto/bio/Makefile.ssl

+3 −1
Original line number Diff line number Diff line
@@ -85,7 +85,9 @@ dclean: 
clean:

	/bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff



errors:

errors: $(ERRC).c



$(ERRC).c: $(ERR).err

	perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h

	perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c

crypto/bn/Makefile.ssl

+3 −1
Original line number Diff line number Diff line
@@ -149,7 +149,9 @@ dclean: 
clean:

	/bin/rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff bn_asm.s



errors:

errors: $(ERRC).c



$(ERRC).c: $(ERR).err

	perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).org # special case .org

	perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h

	perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c