diff options
| author | Yidi Lin <yidilin@chromium.org> | 2023-04-09 13:57:49 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-04-12 01:06:15 +0000 |
| commit | 3edb610af0cd614901c0beb671e0784a8468c533 (patch) | |
| tree | 108c2dfe255cb5ee780f4266254788f836f3e5c5 | |
| parent | 5291abb22297ff0fd3a5f5ec4e4c22c1b0455017 (diff) | |
| download | vboot-3edb610af0cd614901c0beb671e0784a8468c533.tar.gz | |
sha256_armv8a_ce_a64.S: Reuse vb2_sha256_k[] in 2sha256.c
Reuse round constants defined in 2sha256.c instead of having them twice.
BRANCH=none
BUG=none
TEST=boot to kernel
Change-Id: I6fe12b5d65a7c46078781cb1632eba5bca6797a0
Signed-off-by: Yidi Lin <yidilin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4408854
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | firmware/2lib/sha256_armv8a_ce_a64.S | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/firmware/2lib/sha256_armv8a_ce_a64.S b/firmware/2lib/sha256_armv8a_ce_a64.S index 0ef6ae13..664e6a49 100644 --- a/firmware/2lib/sha256_armv8a_ce_a64.S +++ b/firmware/2lib/sha256_armv8a_ce_a64.S @@ -57,13 +57,15 @@ .size \name , .-\name .endm + .extern vb2_sha256_k /* Defined in 2sha256.c */ + /* * void sha2_ce_transform(struct sha256_ce_state *sst, u8 const *src, * int blocks) */ FUNC sha256_ce_transform , : /* load round constants */ - adr x8, .Lsha2_rcon + adr x8, vb2_sha256_k ld1 { v0.4s- v3.4s}, [x8], #64 ld1 { v4.4s- v7.4s}, [x8], #64 ld1 { v8.4s-v11.4s}, [x8], #64 @@ -119,26 +121,4 @@ FUNC sha256_ce_transform , : st1 {dgav.16b}, [x9], #16 st1 {dgbv.16b}, [x9] ret - - /* - * The SHA-256 round constants - */ - .align 4 -.Lsha2_rcon: - .word 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5 - .word 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5 - .word 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3 - .word 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174 - .word 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc - .word 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da - .word 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7 - .word 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967 - .word 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13 - .word 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85 - .word 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3 - .word 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070 - .word 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5 - .word 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3 - .word 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208 - .word 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 END_FUNC sha256_ce_transform |