Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull more crypto fixes from Herbert Xu:
"This fixes a couple of issues in arm64/chacha that was introduced in
5.0"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: arm64/chacha - fix hchacha_block_neon() for big endian
crypto: arm64/chacha - fix chacha_4block_xor_neon() for big endian
+18
-2
+18
-2
arch/arm64/crypto/chacha-neon-core.S
+18
-2
arch/arm64/crypto/chacha-neon-core.S
···
158
158
mov w3, w2
159
159
bl chacha_permute
160
160
161
-
st1 {v0.16b}, [x1], #16
162
-
st1 {v3.16b}, [x1]
161
+
st1 {v0.4s}, [x1], #16
162
+
st1 {v3.4s}, [x1]
163
163
164
164
ldp x29, x30, [sp], #16
165
165
ret
···
532
532
add v3.4s, v3.4s, v19.4s
533
533
add a2, a2, w8
534
534
add a3, a3, w9
535
+
CPU_BE( rev a0, a0 )
536
+
CPU_BE( rev a1, a1 )
537
+
CPU_BE( rev a2, a2 )
538
+
CPU_BE( rev a3, a3 )
535
539
536
540
ld4r {v24.4s-v27.4s}, [x0], #16
537
541
ld4r {v28.4s-v31.4s}, [x0]
···
556
552
add v7.4s, v7.4s, v23.4s
557
553
add a6, a6, w8
558
554
add a7, a7, w9
555
+
CPU_BE( rev a4, a4 )
556
+
CPU_BE( rev a5, a5 )
557
+
CPU_BE( rev a6, a6 )
558
+
CPU_BE( rev a7, a7 )
559
559
560
560
// x8[0-3] += s2[0]
561
561
// x9[0-3] += s2[1]
···
577
569
add v11.4s, v11.4s, v27.4s
578
570
add a10, a10, w8
579
571
add a11, a11, w9
572
+
CPU_BE( rev a8, a8 )
573
+
CPU_BE( rev a9, a9 )
574
+
CPU_BE( rev a10, a10 )
575
+
CPU_BE( rev a11, a11 )
580
576
581
577
// x12[0-3] += s3[0]
582
578
// x13[0-3] += s3[1]
···
598
586
add v15.4s, v15.4s, v31.4s
599
587
add a14, a14, w8
600
588
add a15, a15, w9
589
+
CPU_BE( rev a12, a12 )
590
+
CPU_BE( rev a13, a13 )
591
+
CPU_BE( rev a14, a14 )
592
+
CPU_BE( rev a15, a15 )
601
593
602
594
// interleave 32-bit words in state n, n+1
603
595
ldp w6, w7, [x2], #64