summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crypto/bf/Makefile.in2
-rw-r--r--crypto/bf/asm/bf-586.pl5
-rw-r--r--crypto/bf/build.info8
3 files changed, 8 insertions, 7 deletions
diff --git a/crypto/bf/Makefile.in b/crypto/bf/Makefile.in
index ee5c259923..398844aaeb 100644
--- a/crypto/bf/Makefile.in
+++ b/crypto/bf/Makefile.in
@@ -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
diff --git a/crypto/bf/asm/bf-586.pl b/crypto/bf/asm/bf-586.pl
index b74cfbafd4..319a638754 100644
--- a/crypto/bf/asm/bf-586.pl
+++ b/crypto/bf/asm/bf-586.pl
@@ -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)=@_;
diff --git a/crypto/bf/build.info b/crypto/bf/build.info
index 7d208d209e..466f1343cd 100644
--- a/crypto/bf/build.info
+++ b/crypto/bf/build.info
@@ -1,9 +1,5 @@
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