diff options
author | djm <> | 2010-10-01 22:54:21 +0000 |
---|---|---|
committer | djm <> | 2010-10-01 22:54:21 +0000 |
commit | 829fd51d4f8dde4a7f3bf54754f3c1d1a502f5e2 (patch) | |
tree | e03b9f1bd051e844b971936729e9df549a209130 /src/lib/libcrypto/camellia/asm | |
parent | e6b755d2a53d3cac7a344dfdd6bf7c951cac754c (diff) | |
download | openbsd-829fd51d4f8dde4a7f3bf54754f3c1d1a502f5e2.tar.gz openbsd-829fd51d4f8dde4a7f3bf54754f3c1d1a502f5e2.tar.bz2 openbsd-829fd51d4f8dde4a7f3bf54754f3c1d1a502f5e2.zip |
import OpenSSL-1.0.0a
Diffstat (limited to 'src/lib/libcrypto/camellia/asm')
-rw-r--r-- | src/lib/libcrypto/camellia/asm/cmll-x86.pl | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/camellia/asm/cmll-x86_64.pl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/camellia/asm/cmll-x86.pl b/src/lib/libcrypto/camellia/asm/cmll-x86.pl index 0812815bfb..027302ac86 100644 --- a/src/lib/libcrypto/camellia/asm/cmll-x86.pl +++ b/src/lib/libcrypto/camellia/asm/cmll-x86.pl | |||
@@ -1133,6 +1133,6 @@ my ($s0,$s1,$s2,$s3) = @T; | |||
1133 | &function_end("Camellia_cbc_encrypt"); | 1133 | &function_end("Camellia_cbc_encrypt"); |
1134 | } | 1134 | } |
1135 | 1135 | ||
1136 | &asciz("Camellia for x86 by <appro@openssl.org>"); | 1136 | &asciz("Camellia for x86 by <appro\@openssl.org>"); |
1137 | 1137 | ||
1138 | &asm_finish(); | 1138 | &asm_finish(); |
diff --git a/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl b/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl index c683646ca7..76955e4726 100644 --- a/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl +++ b/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl | |||
@@ -656,7 +656,7 @@ Camellia_cbc_encrypt: | |||
656 | mov %rsi,$out # out argument | 656 | mov %rsi,$out # out argument |
657 | mov %r8,%rbx # ivp argument | 657 | mov %r8,%rbx # ivp argument |
658 | mov %rcx,$key # key argument | 658 | mov %rcx,$key # key argument |
659 | mov 272(%rcx),$keyend # grandRounds | 659 | mov 272(%rcx),${keyend}d # grandRounds |
660 | 660 | ||
661 | mov %r8,$_ivp | 661 | mov %r8,$_ivp |
662 | mov %rbp,$_rsp | 662 | mov %rbp,$_rsp |
@@ -859,7 +859,7 @@ Camellia_cbc_encrypt: | |||
859 | ret | 859 | ret |
860 | .size Camellia_cbc_encrypt,.-Camellia_cbc_encrypt | 860 | .size Camellia_cbc_encrypt,.-Camellia_cbc_encrypt |
861 | 861 | ||
862 | .asciz "Camellia for x86_64 by <appro@openssl.org>" | 862 | .asciz "Camellia for x86_64 by <appro\@openssl.org>" |
863 | ___ | 863 | ___ |
864 | } | 864 | } |
865 | 865 | ||