diff options
| author | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2022-01-08 20:56:19 +0200 |
|---|---|---|
| committer | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2022-01-11 20:10:12 +0200 |
| commit | 11ade08efbfbc36dbf3571f1026946269950bc40 (patch) | |
| tree | 73c1739f302ca2cbac73c244b8dbd533ab516a8f /cipher/salsa20-amd64.S | |
| parent | ff2a647d36677f6ad9edbe992a6c0ab0f7cf9510 (diff) | |
| download | libgcrypt-11ade08efbfbc36dbf3571f1026946269950bc40.tar.gz | |
Add straight-line speculation hardening for amd64 and i386 assembly
* cipher/asm-common-amd64.h (ret_spec_stop): New.
* cipher/arcfour-amd64.S: Use 'ret_spec_stop' for 'ret' instruction.
* cipher/blake2b-amd64-avx2.S: Likewise.
* cipher/blake2s-amd64-avx.S: Likewise.
* cipher/blowfish-amd64.S: Likewise.
* cipher/camellia-aesni-avx-amd64.S: Likewise.
* cipher/camellia-aesni-avx2-amd64.h: Likewise.
* cipher/cast5-amd64.S: Likewise.
* cipher/chacha20-amd64-avx2.S: Likewise.
* cipher/chacha20-amd64-ssse3.S: Likewise.
* cipher/des-amd64.S: Likewise.
* cipher/rijndael-aarch64.S: Likewise.
* cipher/rijndael-amd64.S: Likewise.
* cipher/rijndael-ssse3-amd64-asm.S: Likewise.
* cipher/rijndael-vaes-avx2-amd64.S: Likewise.
* cipher/salsa20-amd64.S: Likewise.
* cipher/serpent-avx2-amd64.S: Likewise.
* cipher/serpent-sse2-amd64.S: Likewise.
* cipher/sha1-avx-amd64.S: Likewise.
* cipher/sha1-avx-bmi2-amd64.S: Likewise.
* cipher/sha1-avx2-bmi2-amd64.S: Likewise.
* cipher/sha1-ssse3-amd64.S: Likewise.
* cipher/sha256-avx-amd64.S: Likewise.
* cipher/sha256-avx2-bmi2-amd64.S: Likewise.
* cipher/sha256-ssse3-amd64.S: Likewise.
* cipher/sha512-avx-amd64.S: Likewise.
* cipher/sha512-avx2-bmi2-amd64.S: Likewise.
* cipher/sha512-ssse3-amd64.S: Likewise.
* cipher/sm3-avx-bmi2-amd64.S: Likewise.
* cipher/sm4-aesni-avx-amd64.S: Likewise.
* cipher/sm4-aesni-avx2-amd64.S: Likewise.
* cipher/twofish-amd64.S: Likewise.
* cipher/twofish-avx2-amd64.S: Likewise.
* cipher/whirlpool-sse2-amd64.S: Likewise.
* mpi/amd64/func_abi.h (CFI_*): Remove, include from "asm-common-amd64.h"
instead.
(FUNC_EXIT): Use 'ret_spec_stop' for 'ret' instruction.
* mpi/asm-common-amd64.h: New.
* mpi/i386/mpih-add1.S: Use 'ret_spec_stop' for 'ret' instruction.
* mpi/i386/mpih-lshift.S: Likewise.
* mpi/i386/mpih-mul1.S: Likewise.
* mpi/i386/mpih-mul2.S: Likewise.
* mpi/i386/mpih-mul3.S: Likewise.
* mpi/i386/mpih-rshift.S: Likewise.
* mpi/i386/mpih-sub1.S: Likewise.
* mpi/i386/syntax.h (ret_spec_stop): New.
--
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Diffstat (limited to 'cipher/salsa20-amd64.S')
| -rw-r--r-- | cipher/salsa20-amd64.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cipher/salsa20-amd64.S b/cipher/salsa20-amd64.S index ae8f2715..64626063 100644 --- a/cipher/salsa20-amd64.S +++ b/cipher/salsa20-amd64.S @@ -83,7 +83,7 @@ _gcry_salsa20_amd64_keysetup: movl %ecx,8(%rdi) movl %r8d,12(%rdi) .L_keysetupdone: - ret + ret_spec_stop CFI_ENDPROC(); .align 8 @@ -99,7 +99,7 @@ _gcry_salsa20_amd64_ivsetup: movl %esi,44(%rdi) movl %r9d,32(%rdi) movl %eax,52(%rdi) - ret + ret_spec_stop CFI_ENDPROC(); .align 8 @@ -926,7 +926,7 @@ _gcry_salsa20_amd64_encrypt_blocks: CFI_DEF_CFA_REGISTER(%rsp) pop %rbx CFI_POP(%rbx) - ret + ret_spec_stop CFI_RESTORE_STATE(); .L_bytes_are_128_or_192: sub $64,%rdx |