Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from #17634)

(cherry picked from commit 07c5465)
  • Loading branch information
@rex4539 @t8m
rex4539 authored and t8m committed Nov 11, 2022
1 parent bbbccd7 commit 817096e
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion apps/speed.c
View file
Expand Up @@ -1467,7 +1467,7 @@ int speed_main(int argc, char **argv)
uint8_t ecdh_doit[EC_NUM] = { 0 };
uint8_t eddsa_doit[EdDSA_NUM] = { 0 };

/* checks declarated curves against choices list. */
/* checks declared curves against choices list. */
OPENSSL_assert(ed_curves[EdDSA_NUM - 1].nid == NID_ED448);
OPENSSL_assert(strcmp(eddsa_choices[EdDSA_NUM - 1].name, "ed448") == 0);

Expand Down
84 changes: 42 additions & 42 deletions crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl
View file
Expand Up @@ -1098,7 +1098,7 @@
ins $acc_m.d[0], $h78k.d[1] @ GHASH final-7 block - mid
eor $rk4v.8b, $rk4v.8b, $res0.8b @ GHASH final-7 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
eor3 $res1b, $ctr_t1b, $ctr1b, $t1.16b @ AES final-6 block - result
Expand All @@ -1119,7 +1119,7 @@
pmull $rk3q1, $res0.1d, $h7.1d @ GHASH final-6 block - low
eor $rk4v.8b, $rk4v.8b, $res0.8b @ GHASH final-6 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull $rk4v.1q, $rk4v.1d, $h78k.1d @ GHASH final-6 block - mid
pmull2 $rk2q1, $res0.2d, $h7.2d @ GHASH final-6 block - high
Expand Down Expand Up @@ -1148,7 +1148,7 @@
eor3 $res1b, $ctr_t1b, $ctr3b, $t1.16b @ AES final-4 block - result
pmull $rk3q1, $res0.1d, $h6.1d @ GHASH final-5 block - low
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull2 $rk4v.1q, $rk4v.2d, $h56k.2d @ GHASH final-5 block - mid
eor $acc_lb, $acc_lb, $rk3 @ GHASH final-5 block - low
Expand All @@ -1165,7 +1165,7 @@
eor $res0b, $res0b, $t0.16b @ feed in partial tag
ins $rk4v.d[0], $res0.d[1] @ GHASH final-4 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull2 $rk2q1, $res0.2d, $h5.2d @ GHASH final-4 block - high
eor $rk4v.8b, $rk4v.8b, $res0.8b @ GHASH final-4 block - mid
Expand All @@ -1189,7 +1189,7 @@
rev64 $res0b, $res1b @ GHASH final-3 block
eor $res0b, $res0b, $t0.16b @ feed in partial tag
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
ins $rk4v.d[0], $res0.d[1] @ GHASH final-3 block - mid
ldr $h34kq, [$current_tag, #96] @ load h4k | h3k
Expand Down Expand Up @@ -1222,7 +1222,7 @@
ins $rk4v.d[0], $res0.d[1] @ GHASH final-2 block - mid
ldr $h3q, [$current_tag, #80] @ load h3l | h3h
ext $h3.16b, $h3.16b, $h3.16b, #8
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
eor $rk4v.8b, $rk4v.8b, $res0.8b @ GHASH final-2 block - mid
eor3 $res1b, $ctr_t1b, $ctr6b, $t1.16b @ AES final-1 block - result
Expand All @@ -1247,7 +1247,7 @@
eor $res0b, $res0b, $t0.16b @ feed in partial tag
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
ins $rk4v.d[0], $res0.d[1] @ GHASH final-1 block - mid
eor3 $res1b, $ctr_t1b, $ctr7b, $t1.16b @ AES final block - result
Expand Down Expand Up @@ -2184,7 +2184,7 @@
pmull $acc_l.1q, $res0.1d, $h8.1d @ GHASH final-7 block - low
ins $rk4v.d[0], $res0.d[1] @ GHASH final-7 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
ldr $res1q, [$input_ptr], #16 @ AES final-6 block - load ciphertext
eor $rk4v.8b, $rk4v.8b, $res0.8b @ GHASH final-7 block - mid
Expand All @@ -2206,7 +2206,7 @@
pmull $rk3q1, $res0.1d, $h7.1d @ GHASH final-6 block - low
ldr $res1q, [$input_ptr], #16 @ AES final-5 block - load ciphertext
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull $rk4v.1q, $rk4v.1d, $h78k.1d @ GHASH final-6 block - mid
st1 { $res4b}, [$output_ptr], #16 @ AES final-6 block - store result
Expand Down Expand Up @@ -2234,7 +2234,7 @@
ins $rk4v.d[1], $rk4v.d[0] @ GHASH final-5 block - mid
pmull $rk3q1, $res0.1d, $h6.1d @ GHASH final-5 block - low
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull2 $rk4v.1q, $rk4v.2d, $h56k.2d @ GHASH final-5 block - mid
pmull2 $rk2q1, $res0.2d, $h6.2d @ GHASH final-5 block - high
Expand All @@ -2250,7 +2250,7 @@
ldr $res1q, [$input_ptr], #16 @ AES final-3 block - load ciphertext
ins $rk4v.d[0], $res0.d[1] @ GHASH final-4 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull2 $rk2q1, $res0.2d, $h5.2d @ GHASH final-4 block - high
pmull $rk3q1, $res0.1d, $h5.1d @ GHASH final-4 block - low
Expand Down Expand Up @@ -2287,7 +2287,7 @@
pmull $rk3q1, $res0.1d, $h4.1d @ GHASH final-3 block - low
pmull2 $rk2q1, $res0.2d, $h4.2d @ GHASH final-3 block - high
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
eor3 $res4b, $res1b, $ctr5b, $t1.16b @ AES final-2 block - result
eor $acc_lb, $acc_lb, $rk3 @ GHASH final-3 block - low
Expand All @@ -2304,7 +2304,7 @@
eor $res0b, $res0b, $t0.16b @ feed in partial tag
ldr $h3q, [$current_tag, #80] @ load h3l | h3h
ext $h3.16b, $h3.16b, $h3.16b, #8
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
ins $rk4v.d[0], $res0.d[1] @ GHASH final-2 block - mid
Expand Down Expand Up @@ -2332,7 +2332,7 @@
eor $res0b, $res0b, $t0.16b @ feed in partial tag
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
ins $rk4v.d[0], $res0.d[1] @ GHASH final-1 block - mid
Expand Down Expand Up @@ -3412,7 +3412,7 @@
ldr $ctr_t1q, [$input_ptr], #16 @ AES final-6 block - load plaintext
eor $rk4v.8b, $rk4v.8b, $res0.8b @ GHASH final-7 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull $acc_l.1q, $res0.1d, $h8.1d @ GHASH final-7 block - low
pmull2 $acc_h.1q, $res0.2d, $h8.2d @ GHASH final-7 block - high
Expand All @@ -3434,7 +3434,7 @@
pmull $rk3q1, $res0.1d, $h7.1d @ GHASH final-6 block - low
eor3 $res1b, $ctr_t1b, $ctr2b, $t1.16b @ AES final-5 block - result
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull2 $rk2q1, $res0.2d, $h7.2d @ GHASH final-6 block - high
eor $rk4v.8b, $rk4v.8b, $res0.8b @ GHASH final-6 block - mid
Expand Down Expand Up @@ -3467,7 +3467,7 @@
pmull2 $rk4v.1q, $rk4v.2d, $h56k.2d @ GHASH final-5 block - mid
eor3 $res1b, $ctr_t1b, $ctr3b, $t1.16b @ AES final-4 block - result
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
eor $acc_mb, $acc_mb, $rk4v.16b @ GHASH final-5 block - mid
.L192_enc_blocks_more_than_4: @ blocks left > 4
Expand All @@ -3487,7 +3487,7 @@
eor $rk4v.8b, $rk4v.8b, $res0.8b @ GHASH final-4 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
eor $acc_lb, $acc_lb, $rk3 @ GHASH final-4 block - low
pmull $rk4v.1q, $rk4v.1d, $h56k.1d @ GHASH final-4 block - mid
Expand All @@ -3502,7 +3502,7 @@
rev64 $res0b, $res1b @ GHASH final-3 block
eor $res0b, $res0b, $t0.16b @ feed in partial tag
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
ldr $ctr_t1q, [$input_ptr], #16 @ AES final-2 block - load plaintext
ldr $h4q, [$current_tag, #112] @ load h4l | h4h
Expand Down Expand Up @@ -3540,7 +3540,7 @@
pmull $rk3q1, $res0.1d, $h3.1d @ GHASH final-2 block - low
pmull2 $rk2q1, $res0.2d, $h3.2d @ GHASH final-2 block - high
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull $rk4v.1q, $rk4v.1d, $h34k.1d @ GHASH final-2 block - mid
Expand Down Expand Up @@ -3574,7 +3574,7 @@
eor3 $res1b, $ctr_t1b, $ctr7b, $t1.16b @ AES final block - result
pmull2 $rk4v.1q, $rk4v.2d, $h12k.2d @ GHASH final-1 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
eor $acc_mb, $acc_mb, $rk4v.16b @ GHASH final-1 block - mid
eor $acc_hb, $acc_hb, $rk2 @ GHASH final-1 block - high
Expand Down Expand Up @@ -4576,7 +4576,7 @@
eor3 $res4b, $res1b, $ctr1b, $t1.16b @ AES final-6 block - result
pmull $acc_m.1q, $rk4v.1d, $acc_m.1d @ GHASH final-7 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
.L192_dec_blocks_more_than_6: @ blocks left > 6
rev64 $res0b, $res1b @ GHASH final-6 block
Expand All @@ -4587,7 +4587,7 @@
ins $rk4v.d[0], $res0.d[1] @ GHASH final-6 block - mid
eor $rk4v.8b, $rk4v.8b, $res0.8b @ GHASH final-6 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull2 $rk2q1, $res0.2d, $h7.2d @ GHASH final-6 block - high
st1 { $res4b}, [$output_ptr], #16 @ AES final-6 block - store result
Expand Down Expand Up @@ -4620,7 +4620,7 @@
pmull2 $rk4v.1q, $rk4v.2d, $h56k.2d @ GHASH final-5 block - mid
eor $acc_lb, $acc_lb, $rk3 @ GHASH final-5 block - low
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
st1 { $res4b}, [$output_ptr], #16 @ AES final-5 block - store result
eor $acc_mb, $acc_mb, $rk4v.16b @ GHASH final-5 block - mid
Expand All @@ -4630,7 +4630,7 @@
rev64 $res0b, $res1b @ GHASH final-4 block
eor $res0b, $res0b, $t0.16b @ feed in partial tag
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
ldr $res1q, [$input_ptr], #16 @ AES final-3 block - load ciphertext
ins $rk4v.d[0], $res0.d[1] @ GHASH final-4 block - mid
Expand Down Expand Up @@ -4661,7 +4661,7 @@
pmull2 $rk2q1, $res0.2d, $h4.2d @ GHASH final-3 block - high
eor $acc_hb, $acc_hb, $rk2 @ GHASH final-3 block - high
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull $rk3q1, $res0.1d, $h4.1d @ GHASH final-3 block - low
st1 { $res4b}, [$output_ptr], #16 @ AES final-3 block - store result
Expand Down Expand Up @@ -4695,7 +4695,7 @@
pmull $rk3q1, $res0.1d, $h3.1d @ GHASH final-2 block - low
pmull $rk4v.1q, $rk4v.1d, $h34k.1d @ GHASH final-2 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
eor $acc_lb, $acc_lb, $rk3 @ GHASH final-2 block - low
st1 { $res4b}, [$output_ptr], #16 @ AES final-2 block - store result
Expand All @@ -4710,7 +4710,7 @@
ext $h2.16b, $h2.16b, $h2.16b, #8
eor $res0b, $res0b, $t0.16b @ feed in partial tag
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
ldr $h12kq, [$current_tag, #48] @ load h2k | h1k
pmull $rk3q1, $res0.1d, $h2.1d @ GHASH final-1 block - low
Expand Down Expand Up @@ -5854,7 +5854,7 @@
ins $rk4v.d[0], $res0.d[1] @ GHASH final-7 block - mid
ins $acc_m.d[0], $h78k.d[1] @ GHASH final-7 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
eor $rk4v.8b, $rk4v.8b, $res0.8b @ GHASH final-7 block - mid
eor3 $res1b, $ctr_t1b, $ctr1b, $t1.16b @ AES final-6 block - result
Expand Down Expand Up @@ -5882,7 +5882,7 @@
pmull $rk4v.1q, $rk4v.1d, $h78k.1d @ GHASH final-6 block - mid
eor3 $res1b, $ctr_t1b, $ctr2b, $t1.16b @ AES final-5 block - result
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
eor $acc_mb, $acc_mb, $rk4v.16b @ GHASH final-6 block - mid
eor $acc_hb, $acc_hb, $rk2 @ GHASH final-6 block - high
Expand All @@ -5907,7 +5907,7 @@
pmull $rk3q1, $res0.1d, $h6.1d @ GHASH final-5 block - low
pmull2 $rk4v.1q, $rk4v.2d, $h56k.2d @ GHASH final-5 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
eor $acc_lb, $acc_lb, $rk3 @ GHASH final-5 block - low
eor $acc_mb, $acc_mb, $rk4v.16b @ GHASH final-5 block - mid
Expand All @@ -5933,7 +5933,7 @@
pmull $rk4v.1q, $rk4v.1d, $h56k.1d @ GHASH final-4 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
eor $acc_mb, $acc_mb, $rk4v.16b @ GHASH final-4 block - mid
eor $acc_hb, $acc_hb, $rk2 @ GHASH final-4 block - high
Expand Down Expand Up @@ -5961,7 +5961,7 @@
pmull $rk3q1, $res0.1d, $h4.1d @ GHASH final-3 block - low
eor3 $res1b, $ctr_t1b, $ctr5b, $t1.16b @ AES final-2 block - result
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
eor $acc_mb, $acc_mb, $rk4v.16b @ GHASH final-3 block - mid
eor $acc_lb, $acc_lb, $rk3 @ GHASH final-3 block - low
Expand All @@ -5979,7 +5979,7 @@
ins $rk4v.d[0], $res0.d[1] @ GHASH final-2 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull2 $rk2q1, $res0.2d, $h3.2d @ GHASH final-2 block - high
eor3 $res1b, $ctr_t1b, $ctr6b, $t1.16b @ AES final-1 block - result
Expand All @@ -6003,7 +6003,7 @@
ldr $ctr_t1q, [$input_ptr], #16 @ AES final block - load plaintext
eor $res0b, $res0b, $t0.16b @ feed in partial tag
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
ins $rk4v.d[0], $res0.d[1] @ GHASH final-1 block - mid
pmull2 $rk2q1, $res0.2d, $h2.2d @ GHASH final-1 block - high
Expand Down Expand Up @@ -7086,7 +7086,7 @@
pmull2 $acc_h.1q, $res0.2d, $h8.2d @ GHASH final-7 block - high
eor $rk4v.8b, $rk4v.8b, $res0.8b @ GHASH final-7 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull $acc_l.1q, $res0.1d, $h8.1d @ GHASH final-7 block - low
pmull $acc_m.1q, $rk4v.1d, $acc_m.1d @ GHASH final-7 block - mid
Expand All @@ -7096,7 +7096,7 @@
eor $res0b, $res0b, $t0.16b @ feed in partial tag
ldr $res1q, [$input_ptr], #16 @ AES final-5 block - load ciphertext
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
ins $rk4v.d[0], $res0.d[1] @ GHASH final-6 block - mid
st1 { $res4b}, [$output_ptr], #16 @ AES final-6 block - store result
Expand Down Expand Up @@ -7136,7 +7136,7 @@
eor $acc_lb, $acc_lb, $rk3 @ GHASH final-5 block - low
eor $acc_mb, $acc_mb, $rk4v.16b @ GHASH final-5 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
.L256_dec_blocks_more_than_4: @ blocks left > 4
rev64 $res0b, $res1b @ GHASH final-4 block
Expand All @@ -7146,7 +7146,7 @@
ins $rk4v.d[0], $res0.d[1] @ GHASH final-4 block - mid
ldr $res1q, [$input_ptr], #16 @ AES final-3 block - load ciphertext
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull $rk3q1, $res0.1d, $h5.1d @ GHASH final-4 block - low
pmull2 $rk2q1, $res0.2d, $h5.2d @ GHASH final-4 block - high
Expand Down Expand Up @@ -7183,7 +7183,7 @@
pmull $rk3q1, $res0.1d, $h4.1d @ GHASH final-3 block - low
pmull2 $rk2q1, $res0.2d, $h4.2d @ GHASH final-3 block - high
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull2 $rk4v.1q, $rk4v.2d, $h34k.2d @ GHASH final-3 block - mid
eor $acc_lb, $acc_lb, $rk3 @ GHASH final-3 block - low
Expand All @@ -7208,7 +7208,7 @@
eor $rk4v.8b, $rk4v.8b, $res0.8b @ GHASH final-2 block - mid
eor $acc_lb, $acc_lb, $rk3 @ GHASH final-2 block - low
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
pmull $rk4v.1q, $rk4v.1d, $h34k.1d @ GHASH final-2 block - mid
pmull2 $rk2q1, $res0.2d, $h3.2d @ GHASH final-2 block - high
Expand Down Expand Up @@ -7241,7 +7241,7 @@
pmull2 $rk4v.1q, $rk4v.2d, $h12k.2d @ GHASH final-1 block - mid
movi $t0.8b, #0 @ surpress further partial tag feed in
movi $t0.8b, #0 @ supress further partial tag feed in
eor $acc_hb, $acc_hb, $rk2 @ GHASH final-1 block - high
eor $acc_mb, $acc_mb, $rk4v.16b @ GHASH final-1 block - mid
Expand Down

0 comments on commit 817096e

Please sign in to comment.