Commit 10eab320 authored by Richard Levitte's avatar Richard Levitte
Browse files

Unified - adapt the generation of blowfish assembler to use GENERATE 



This gets rid of the BEGINRAW..ENDRAW sections in crypto/bf/build.info.

This also moves the assembler generating perl scripts to take the
output file name as last command line argument, where necessary.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 71a07ca7

crypto/bf/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ lib: $(LIBOBJ) 
	@touch lib



bf-586.s:	asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl

	$(PERL) asm/bf-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

	$(PERL) asm/bf-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) $@



files:

	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

crypto/bf/asm/bf-586.pl

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ push(@INC,"${dir}","${dir}../../perlasm"); 
require "x86asm.pl";

require "cbc.pl";



$output = pop;

open STDOUT,">$output";



&asm_init($ARGV[0],"bf-586.pl",$ARGV[$#ARGV] eq "386");



$BF_ROUNDS=16;
@@ -22,6 +25,8 @@ $tmp4="edx"; 
&cbc("BF_cbc_encrypt","BF_encrypt","BF_decrypt",1,4,5,3,-1,-1);

&asm_finish();



close STDOUT;



sub BF_encrypt

	{

	local($name,$enc)=@_;

crypto/bf/build.info

+2 −6
Original line number Diff line number Diff line 
LIBS=../../libcrypto

SOURCE[../../libcrypto]=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c 



BEGINRAW[Makefile]

##### BF assembler implementations



{- $builddir -}/bf-586.s:	{- $sourcedir -}/asm/bf-586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl {- $sourcetop -}/crypto/perlasm/cbc.pl

	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/bf-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

ENDRAW[Makefile]
 
GENERATE[bf-586.s]=asm/bf-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)

DEPEND[bf-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl