提交 10eab320 编写于 作者: R Richard Levitte

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: NAndy Polyakov <appro@openssl.org>
上级 71a07ca7
...@@ -40,7 +40,7 @@ lib: $(LIBOBJ) ...@@ -40,7 +40,7 @@ lib: $(LIBOBJ)
@touch lib @touch lib
bf-586.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl 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: files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
......
...@@ -5,6 +5,9 @@ push(@INC,"${dir}","${dir}../../perlasm"); ...@@ -5,6 +5,9 @@ push(@INC,"${dir}","${dir}../../perlasm");
require "x86asm.pl"; require "x86asm.pl";
require "cbc.pl"; require "cbc.pl";
$output = pop;
open STDOUT,">$output";
&asm_init($ARGV[0],"bf-586.pl",$ARGV[$#ARGV] eq "386"); &asm_init($ARGV[0],"bf-586.pl",$ARGV[$#ARGV] eq "386");
$BF_ROUNDS=16; $BF_ROUNDS=16;
...@@ -22,6 +25,8 @@ $tmp4="edx"; ...@@ -22,6 +25,8 @@ $tmp4="edx";
&cbc("BF_cbc_encrypt","BF_encrypt","BF_decrypt",1,4,5,3,-1,-1); &cbc("BF_cbc_encrypt","BF_encrypt","BF_decrypt",1,4,5,3,-1,-1);
&asm_finish(); &asm_finish();
close STDOUT;
sub BF_encrypt sub BF_encrypt
{ {
local($name,$enc)=@_; local($name,$enc)=@_;
......
LIBS=../../libcrypto LIBS=../../libcrypto
SOURCE[../../libcrypto]=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c SOURCE[../../libcrypto]=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c
BEGINRAW[Makefile] GENERATE[bf-586.s]=asm/bf-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR)
##### BF assembler implementations DEPEND[bf-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl
{- $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]
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册