diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-02-01 23:14:33 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2014-02-01 23:14:33 +0100 |
| commit | cb437c66d1c3aea03bc5b96b221201ce7532f915 (patch) | |
| tree | 5279bf634d7c2e31d3fe585620da8d9f79d3b16c /crypto/camellia | |
| parent | 40b0d0765ec8d34654be099456dc1dfb6e1bd3ff (diff) | |
camellia/asm/cmll-x86_64.pl: fix symptomless bugs (update from master).
Diffstat (limited to 'crypto/camellia')
| -rw-r--r-- | crypto/camellia/asm/cmll-x86_64.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/camellia/asm/cmll-x86_64.pl b/crypto/camellia/asm/cmll-x86_64.pl index 9f4b82fa48..d94f46b887 100644 --- a/crypto/camellia/asm/cmll-x86_64.pl +++ b/crypto/camellia/asm/cmll-x86_64.pl @@ -72,7 +72,7 @@ my $i=@_[0]; my $seed=defined(@_[1])?@_[1]:0; my $scale=$seed<0?-8:8; my $j=($i&1)*2; -my $s0=@S[($j)%4],$s1=@S[($j+1)%4],$s2=@S[($j+2)%4],$s3=@S[($j+3)%4]; +my ($s0,$s1,$s2,$s3)=(@S[($j)%4],@S[($j+1)%4],@S[($j+2)%4],@S[($j+3)%4]); $code.=<<___; xor $s0,$t0 # t0^=key[0] @@ -409,7 +409,7 @@ Camellia_Ekeygen: push %r15 .Lkey_prologue: - mov %rdi,$keyend # put away arguments, keyBitLength + mov %edi,${keyend}d # put away arguments, keyBitLength mov %rdx,$out # keyTable mov 0(%rsi),@S[0] # load 0-127 bits |