Skip to content

ppc64 SHA-2 crypto asm: byte-swap message words on little-endian #11999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SparkiDev merged 3 commits into from
Nov 5, 2026
Merged

ppc64 SHA-2 crypto asm: byte-swap message words on little-endian #11999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b63348
ppc64 SHA-2 crypto asm: byte-swap message words on little-endian
kaleb-himes Nov 4, 2026
b411f09
sha256: reverse Transform block words for PPC64 asm on little-endian
kaleb-himes Nov 4, 2026
3471f22
pwdbased: run scryptSalsa on a word32 copy in scryptBlockMix
kaleb-himes Nov 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions wolfcrypt/src/port/ppc64/ppc64-sha256-asm.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3494,22 +3494,39 @@ L_SHA256_crypto_begin:
vsldoi 6, 4, 4, 8
vsldoi 7, 4, 4, 12
# Load message, one word per vector register
#ifdef __LITTLE_ENDIAN__
lvsl 9, 0, 8
vspltisb 10, 3
vxor 9, 9, 10
#endif /* __LITTLE_ENDIAN__ */
lxvw4x 48, 0, 4
#ifdef __LITTLE_ENDIAN__
vperm 16, 16, 16, 9
#endif /* __LITTLE_ENDIAN__ */
addi 4, 4, 16
vsldoi 17, 16, 16, 4
vsldoi 18, 16, 16, 8
vsldoi 19, 16, 16, 12
lxvw4x 52, 0, 4
#ifdef __LITTLE_ENDIAN__
vperm 20, 20, 20, 9
#endif /* __LITTLE_ENDIAN__ */
addi 4, 4, 16
vsldoi 21, 20, 20, 4
vsldoi 22, 20, 20, 8
vsldoi 23, 20, 20, 12
lxvw4x 56, 0, 4
#ifdef __LITTLE_ENDIAN__
vperm 24, 24, 24, 9
#endif /* __LITTLE_ENDIAN__ */
addi 4, 4, 16
vsldoi 25, 24, 24, 4
vsldoi 26, 24, 24, 8
vsldoi 27, 24, 24, 12
lxvw4x 60, 0, 4
#ifdef __LITTLE_ENDIAN__
vperm 28, 28, 28, 9
#endif /* __LITTLE_ENDIAN__ */
addi 4, 4, 16
vsldoi 29, 28, 28, 4
vsldoi 30, 28, 28, 8
Expand Down
17 changes: 17 additions & 0 deletions wolfcrypt/src/port/ppc64/ppc64-sha256-asm_c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3422,22 +3422,39 @@ void Transform_Sha256_Len_crypto(wc_Sha256* sha256, const byte* data,
"vsldoi 6, 4, 4, 8\n\t"
"vsldoi 7, 4, 4, 12\n\t"
/* Load message, one word per vector register */
#ifdef __LITTLE_ENDIAN__
"lvsl 9, 0, 8\n\t"
"vspltisb 10, 3\n\t"
"vxor 9, 9, 10\n\t"
#endif /* __LITTLE_ENDIAN__ */
"lxvw4x 48, 0, %[data]\n\t"
#ifdef __LITTLE_ENDIAN__
"vperm 16, 16, 16, 9\n\t"
#endif /* __LITTLE_ENDIAN__ */
"addi %[data], %[data], 16\n\t"
"vsldoi 17, 16, 16, 4\n\t"
"vsldoi 18, 16, 16, 8\n\t"
"vsldoi 19, 16, 16, 12\n\t"
"lxvw4x 52, 0, %[data]\n\t"
#ifdef __LITTLE_ENDIAN__
"vperm 20, 20, 20, 9\n\t"
#endif /* __LITTLE_ENDIAN__ */
"addi %[data], %[data], 16\n\t"
"vsldoi 21, 20, 20, 4\n\t"
"vsldoi 22, 20, 20, 8\n\t"
"vsldoi 23, 20, 20, 12\n\t"
"lxvw4x 56, 0, %[data]\n\t"
#ifdef __LITTLE_ENDIAN__
"vperm 24, 24, 24, 9\n\t"
#endif /* __LITTLE_ENDIAN__ */
"addi %[data], %[data], 16\n\t"
"vsldoi 25, 24, 24, 4\n\t"
"vsldoi 26, 24, 24, 8\n\t"
"vsldoi 27, 24, 24, 12\n\t"
"lxvw4x 60, 0, %[data]\n\t"
#ifdef __LITTLE_ENDIAN__
"vperm 28, 28, 28, 9\n\t"
#endif /* __LITTLE_ENDIAN__ */
"addi %[data], %[data], 16\n\t"
"vsldoi 29, 28, 28, 4\n\t"
"vsldoi 30, 28, 28, 8\n\t"
Expand Down
29 changes: 29 additions & 0 deletions wolfcrypt/src/port/ppc64/ppc64-sha512-asm.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4185,28 +4185,57 @@ L_SHA512_crypto_begin:
vsldoi 5, 4, 4, 8
vsldoi 7, 6, 6, 8
# Load message, one doubleword per vector register
#ifdef __LITTLE_ENDIAN__
lvsl 9, 0, 8
vspltisb 10, 7
vxor 9, 9, 10
#endif /* __LITTLE_ENDIAN__ */
lxvd2x 48, 0, 4
#ifdef __LITTLE_ENDIAN__
vperm 16, 16, 16, 9
#endif /* __LITTLE_ENDIAN__ */
addi 4, 4, 16
vsldoi 17, 16, 16, 8
lxvd2x 50, 0, 4
#ifdef __LITTLE_ENDIAN__
vperm 18, 18, 18, 9
#endif /* __LITTLE_ENDIAN__ */
addi 4, 4, 16
vsldoi 19, 18, 18, 8
lxvd2x 52, 0, 4
#ifdef __LITTLE_ENDIAN__
vperm 20, 20, 20, 9
#endif /* __LITTLE_ENDIAN__ */
addi 4, 4, 16
vsldoi 21, 20, 20, 8
lxvd2x 54, 0, 4
#ifdef __LITTLE_ENDIAN__
vperm 22, 22, 22, 9
#endif /* __LITTLE_ENDIAN__ */
addi 4, 4, 16
vsldoi 23, 22, 22, 8
lxvd2x 56, 0, 4
#ifdef __LITTLE_ENDIAN__
vperm 24, 24, 24, 9
#endif /* __LITTLE_ENDIAN__ */
addi 4, 4, 16
vsldoi 25, 24, 24, 8
lxvd2x 58, 0, 4
#ifdef __LITTLE_ENDIAN__
vperm 26, 26, 26, 9
#endif /* __LITTLE_ENDIAN__ */
addi 4, 4, 16
vsldoi 27, 26, 26, 8
lxvd2x 60, 0, 4
#ifdef __LITTLE_ENDIAN__
vperm 28, 28, 28, 9
#endif /* __LITTLE_ENDIAN__ */
addi 4, 4, 16
vsldoi 29, 28, 28, 8
lxvd2x 62, 0, 4
#ifdef __LITTLE_ENDIAN__
vperm 30, 30, 30, 9
#endif /* __LITTLE_ENDIAN__ */
addi 4, 4, 16
vsldoi 31, 30, 30, 8
# Preload first key
Expand Down
29 changes: 29 additions & 0 deletions wolfcrypt/src/port/ppc64/ppc64-sha512-asm_c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4113,28 +4113,57 @@ void Transform_Sha512_Len_crypto(wc_Sha512* sha512, const byte* data,
"vsldoi 5, 4, 4, 8\n\t"
"vsldoi 7, 6, 6, 8\n\t"
/* Load message, one doubleword per vector register */
#ifdef __LITTLE_ENDIAN__
"lvsl 9, 0, 8\n\t"
"vspltisb 10, 7\n\t"
"vxor 9, 9, 10\n\t"
#endif /* __LITTLE_ENDIAN__ */
"lxvd2x 48, 0, %[data]\n\t"
#ifdef __LITTLE_ENDIAN__
"vperm 16, 16, 16, 9\n\t"
#endif /* __LITTLE_ENDIAN__ */
"addi %[data], %[data], 16\n\t"
"vsldoi 17, 16, 16, 8\n\t"
"lxvd2x 50, 0, %[data]\n\t"
#ifdef __LITTLE_ENDIAN__
"vperm 18, 18, 18, 9\n\t"
#endif /* __LITTLE_ENDIAN__ */
"addi %[data], %[data], 16\n\t"
"vsldoi 19, 18, 18, 8\n\t"
"lxvd2x 52, 0, %[data]\n\t"
#ifdef __LITTLE_ENDIAN__
"vperm 20, 20, 20, 9\n\t"
#endif /* __LITTLE_ENDIAN__ */
"addi %[data], %[data], 16\n\t"
"vsldoi 21, 20, 20, 8\n\t"
"lxvd2x 54, 0, %[data]\n\t"
#ifdef __LITTLE_ENDIAN__
"vperm 22, 22, 22, 9\n\t"
#endif /* __LITTLE_ENDIAN__ */
"addi %[data], %[data], 16\n\t"
"vsldoi 23, 22, 22, 8\n\t"
"lxvd2x 56, 0, %[data]\n\t"
#ifdef __LITTLE_ENDIAN__
"vperm 24, 24, 24, 9\n\t"
#endif /* __LITTLE_ENDIAN__ */
"addi %[data], %[data], 16\n\t"
"vsldoi 25, 24, 24, 8\n\t"
"lxvd2x 58, 0, %[data]\n\t"
#ifdef __LITTLE_ENDIAN__
"vperm 26, 26, 26, 9\n\t"
#endif /* __LITTLE_ENDIAN__ */
"addi %[data], %[data], 16\n\t"
"vsldoi 27, 26, 26, 8\n\t"
"lxvd2x 60, 0, %[data]\n\t"
#ifdef __LITTLE_ENDIAN__
"vperm 28, 28, 28, 9\n\t"
#endif /* __LITTLE_ENDIAN__ */
"addi %[data], %[data], 16\n\t"
"vsldoi 29, 28, 28, 8\n\t"
"lxvd2x 62, 0, %[data]\n\t"
#ifdef __LITTLE_ENDIAN__
"vperm 30, 30, 30, 9\n\t"
#endif /* __LITTLE_ENDIAN__ */
"addi %[data], %[data], 16\n\t"
"vsldoi 31, 30, 30, 8\n\t"
/* Preload first key */
Expand Down
8 changes: 6 additions & 2 deletions wolfcrypt/src/pwdbased.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,7 @@ static void scryptBlockMix(byte* b, byte* y, int r)
{
#ifdef WORD64_AVAILABLE
word64 x[8];
word32 x32[16];
word64* b64 = (word64*)b;
word64* y64 = (word64*)y;
#else
Expand All @@ -955,12 +956,15 @@ static void scryptBlockMix(byte* b, byte* y, int r)
#ifdef WORD64_AVAILABLE
for (j = 0; j < 8; j++)
x[j] ^= b64[i * 8 + j];

/* C11 6.5p7: x is word64, so run the word32 Salsa on a word32 copy. */
XMEMCPY(x32, x, sizeof(x32));
scryptSalsa(x32, x32);
XMEMCPY(x, x32, sizeof(x));
#else
for (j = 0; j < 16; j++)
x[j] ^= b32[i * 16 + j];
scryptSalsa(x, x);
#endif
scryptSalsa((word32*)x, (word32*)x);
XMEMCPY(y + i * 64, x, sizeof(x));
}
/* Step 3. */
Expand Down
3 changes: 2 additions & 1 deletion wolfcrypt/src/sha256.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2585,7 +2585,8 @@ static WC_INLINE int Transform_Sha256_Len(wc_Sha256* sha256, const byte* data,
return BAD_FUNC_ARG;
}

#if defined(WOLFSSL_ARMASM) || defined(WOLFSSL_RISCV_ASM)
#if defined(WOLFSSL_ARMASM) || defined(WOLFSSL_RISCV_ASM) || \
(defined(WOLFSSL_PPC64_ASM) && defined(LITTLE_ENDIAN_ORDER))
#ifdef __aarch64__
if (Transform_Sha256_Len_p == Transform_Sha256_Len) {
return Transform_Sha256(sha256, data);
Expand Down
Loading