diff options
| author | deraadt <> | 2023-01-14 16:58:56 +0000 |
|---|---|---|
| committer | deraadt <> | 2023-01-14 16:58:56 +0000 |
| commit | eb72d17d580445c364a2dfb2d637026a00e779eb (patch) | |
| tree | 091fefd47bf297796c9ff374bd3f19f6e0cd6da8 /src/lib/libcrypto/camellia | |
| parent | 2caf68e3ec46ff4ba172978eb728e2aa23948684 (diff) | |
| download | openbsd-eb72d17d580445c364a2dfb2d637026a00e779eb.tar.gz openbsd-eb72d17d580445c364a2dfb2d637026a00e779eb.tar.bz2 openbsd-eb72d17d580445c364a2dfb2d637026a00e779eb.zip | |
Move constants out of text segment into rodata to prepare for xonly support
on amd64. no pic handling is neccessary since amd64 has full reach.
ok kettenis
Diffstat (limited to 'src/lib/libcrypto/camellia')
| -rw-r--r-- | src/lib/libcrypto/camellia/asm/cmll-x86_64.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl b/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl index df6bf11a28..90c56d9e50 100644 --- a/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl +++ b/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl | |||
| @@ -599,6 +599,7 @@ sub S0222 { my $i=shift; $i=@SBOX[$i]; $i=($i<<1|$i>>7)&0xff; $i=$i<<16|$i<<8|$i | |||
| 599 | sub S3033 { my $i=shift; $i=@SBOX[$i]; $i=($i>>1|$i<<7)&0xff; $i=$i<<24|$i<<8|$i; sprintf("0x%08x",$i); } | 599 | sub S3033 { my $i=shift; $i=@SBOX[$i]; $i=($i>>1|$i<<7)&0xff; $i=$i<<24|$i<<8|$i; sprintf("0x%08x",$i); } |
| 600 | 600 | ||
| 601 | $code.=<<___; | 601 | $code.=<<___; |
| 602 | .rodata | ||
| 602 | .align 64 | 603 | .align 64 |
| 603 | .LCamellia_SIGMA: | 604 | .LCamellia_SIGMA: |
| 604 | .long 0x3bcc908b, 0xa09e667f, 0x4caa73b2, 0xb67ae858 | 605 | .long 0x3bcc908b, 0xa09e667f, 0x4caa73b2, 0xb67ae858 |
| @@ -624,6 +625,7 @@ $_ivp="40(%rsp)"; | |||
| 624 | $_rsp="48(%rsp)"; | 625 | $_rsp="48(%rsp)"; |
| 625 | 626 | ||
| 626 | $code.=<<___; | 627 | $code.=<<___; |
| 628 | .previous | ||
| 627 | .globl Camellia_cbc_encrypt | 629 | .globl Camellia_cbc_encrypt |
| 628 | .type Camellia_cbc_encrypt,\@function,6 | 630 | .type Camellia_cbc_encrypt,\@function,6 |
| 629 | .align 16 | 631 | .align 16 |
| @@ -857,8 +859,6 @@ Camellia_cbc_encrypt: | |||
| 857 | .Lcbc_abort: | 859 | .Lcbc_abort: |
| 858 | ret | 860 | ret |
| 859 | .size Camellia_cbc_encrypt,.-Camellia_cbc_encrypt | 861 | .size Camellia_cbc_encrypt,.-Camellia_cbc_encrypt |
| 860 | |||
| 861 | .asciz "Camellia for x86_64 by <appro\@openssl.org>" | ||
| 862 | ___ | 862 | ___ |
| 863 | } | 863 | } |
| 864 | 864 | ||
