wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

wolfcrypt/src/siphash.c: fix bugprone-macro-parentheses, and in wc_SipHash(), fix clang-diagnostic-overlength-strings around inline asm.

Browse Source
This commit is contained in:
Daniel Pouzzner
2022-11-18 22:43:13 -06:00
parent 6f98a5b271
commit 2fa206dec0
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wolfcrypt/src/siphash.c
View File

@ -90,7 +90,7 @@
* @param [out] a Byte array to write into. * @param [out] a Byte array to write into.
* @param [in] n Number to encode. * @param [in] n Number to encode.
*/ */
#define SET_U64(a, n) ((*(word64*)(a)) = n) #define SET_U64(a, n) ((*(word64*)(a)) = (n))
#else #else
/** /**
* Decode little-endian byte array to 64-bit number. * Decode little-endian byte array to 64-bit number.
@ -465,6 +465,12 @@ int wc_SipHash(const unsigned char* key, const unsigned char* in, word32 inSz,
"orq %%r12, %%r13\n\t" "orq %%r12, %%r13\n\t"
"L_siphash_n6:\n\t" "L_siphash_n6:\n\t"
: [in] "+r" (in), [inSz] "+r" (inSz)
: [key] "r" (key), [out] "r" (out) , [outSz] "r" (outSz)
: "memory", "%r8", "%r9", "%r10", "%r11", "%r12", "%r13"
);
__asm__ __volatile__ (
"cmp $5, %[inSz]\n\t" "cmp $5, %[inSz]\n\t"
"jl L_siphash_n5\n\t" "jl L_siphash_n5\n\t"
"movzbq 4(%[in]), %%r12\n\t" "movzbq 4(%[in]), %%r12\n\t"
@ -510,6 +516,12 @@ int wc_SipHash(const unsigned char* key, const unsigned char* in, word32 inSz,
"cmp $8, %[outSz]\n\t" "cmp $8, %[outSz]\n\t"
"je L_siphash_8_end\n\t" "je L_siphash_8_end\n\t"
: [in] "+r" (in), [inSz] "+r" (inSz)
: [key] "r" (key), [out] "r" (out) , [outSz] "r" (outSz)
: "memory", "%r8", "%r9", "%r10", "%r11", "%r12", "%r13"
);
__asm__ __volatile__ (
"xor $0xee, %%r10b\n\t" "xor $0xee, %%r10b\n\t"
#if WOLFSSL_SIPHASH_DROUNDS == 2 #if WOLFSSL_SIPHASH_DROUNDS == 2
SIPHASH_ROUND(%%r8, %%r9, %%r10, %%r11) SIPHASH_ROUND(%%r8, %%r9, %%r10, %%r11)