summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2009-04-06 06:30:03 +0000
committerDamien Miller <djm@cvs.openbsd.org>2009-04-06 06:30:03 +0000
commit122da34990e5140050968e316ebbe926c66e302e (patch)
treed4045aee0bf85ad1d3daef4ae9c0dff89611c796 /lib
parenta7025bc111eb214851efa33b1905da118b71f9ea (diff)
import of OpenSSL 0.9.8k
Diffstat (limited to 'lib')
-rw-r--r--lib/libssl/src/crypto/camellia/asm/cmll-x86_64.pl7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/libssl/src/crypto/camellia/asm/cmll-x86_64.pl b/lib/libssl/src/crypto/camellia/asm/cmll-x86_64.pl
index 9f4b82fa482..c683646ca7c 100644
--- a/lib/libssl/src/crypto/camellia/asm/cmll-x86_64.pl
+++ b/lib/libssl/src/crypto/camellia/asm/cmll-x86_64.pl
@@ -40,8 +40,7 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or
die "can't locate x86_64-xlate.pl";
-open OUT,"| \"$^X\" $xlate $flavour $output";
-*STDOUT=*OUT;
+open STDOUT,"| $^X $xlate $flavour $output";
sub hi() { my $r=shift; $r =~ s/%[er]([a-d])x/%\1h/; $r; }
sub lo() { my $r=shift; $r =~ s/%[er]([a-d])x/%\1l/;
@@ -657,7 +656,7 @@ Camellia_cbc_encrypt:
mov %rsi,$out # out argument
mov %r8,%rbx # ivp argument
mov %rcx,$key # key argument
- mov 272(%rcx),${keyend}d # grandRounds
+ mov 272(%rcx),$keyend # grandRounds
mov %r8,$_ivp
mov %rbp,$_rsp
@@ -860,7 +859,7 @@ Camellia_cbc_encrypt:
ret
.size Camellia_cbc_encrypt,.-Camellia_cbc_encrypt
-.asciz "Camellia for x86_64 by <appro\@openssl.org>"
+.asciz "Camellia for x86_64 by <appro@openssl.org>"
___
}