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

Merge pull request #8482 from douzzer/20250220-misc-UnalignedWord64

Browse Source 
20250220-misc-UnalignedWord64
This commit is contained in:
JacobBarthelmeh
2025-02-20 17:26:44 -07:00
committed by GitHub
parent 781d85284c a05436066d
commit 8ae122584c
3 changed files with 25 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
wolfcrypt/src/misc.c
View File

@ -254,36 +254,6 @@ WC_MISC_STATIC WC_INLINE void writeUnalignedWords32(byte *out, const word32 *in,
#if defined(WORD64_AVAILABLE) && !defined(WOLFSSL_NO_WORD64_OPS) #if defined(WORD64_AVAILABLE) && !defined(WOLFSSL_NO_WORD64_OPS)
#ifdef WOLFSSL_X86_64_BUILD
WC_MISC_STATIC WC_INLINE word64 readUnalignedWord64(const byte *in)
{
return ((word64*)in)[0];
}
WC_MISC_STATIC WC_INLINE word64 writeUnalignedWord64(void *out, word64 in)
{
return ((word64*)out)[0] = in;
}
WC_MISC_STATIC WC_INLINE void readUnalignedWords64(word64 *out, const byte *in,
size_t count)
{
const word64 *in_word64 = (const word64 *)in;
while (count-- > 0)
*out++ = *in_word64++;
}
WC_MISC_STATIC WC_INLINE void writeUnalignedWords64(byte *out, const word64 *in,
size_t count)
{
word64 *out_word64 = (word64 *)out;
while (count-- > 0)
*out_word64++ = *in++;
}
#else
WC_MISC_STATIC WC_INLINE word64 readUnalignedWord64(const byte *in) WC_MISC_STATIC WC_INLINE word64 readUnalignedWord64(const byte *in)
{ {
if (((wc_ptr_t)in & (wc_ptr_t)(sizeof(word64) - 1U)) == (wc_ptr_t)0) if (((wc_ptr_t)in & (wc_ptr_t)(sizeof(word64) - 1U)) == (wc_ptr_t)0)
@ -331,8 +301,6 @@ WC_MISC_STATIC WC_INLINE void writeUnalignedWords64(byte *out, const word64 *in,
} }
} }
#endif
WC_MISC_STATIC WC_INLINE word64 rotlFixed64(word64 x, word64 y) WC_MISC_STATIC WC_INLINE word64 rotlFixed64(word64 x, word64 y)
{ {
return (x << y) | (x >> (sizeof(y) * 8 - y)); return (x << y) | (x >> (sizeof(y) * 8 - y));

34
wolfcrypt/test/test.c
View File

@ -17157,18 +17157,18 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t camellia_test(void)
wc_Camellia cam; wc_Camellia cam;
WOLFSSL_SMALL_STACK_STATIC const test_vector_t testVectors[] = WOLFSSL_SMALL_STACK_STATIC const test_vector_t testVectors[] =
{ {
{CAM_ECB_ENC, pte, ive, c1, k1, sizeof(k1), -114}, {CAM_ECB_ENC, pte, ive, c1, k1, sizeof(k1), 114},
{CAM_ECB_ENC, pte, ive, c2, k2, sizeof(k2), -115}, {CAM_ECB_ENC, pte, ive, c2, k2, sizeof(k2), 115},
{CAM_ECB_ENC, pte, ive, c3, k3, sizeof(k3), -116}, {CAM_ECB_ENC, pte, ive, c3, k3, sizeof(k3), 116},
{CAM_ECB_DEC, pte, ive, c1, k1, sizeof(k1), -117}, {CAM_ECB_DEC, pte, ive, c1, k1, sizeof(k1), 117},
{CAM_ECB_DEC, pte, ive, c2, k2, sizeof(k2), -118}, {CAM_ECB_DEC, pte, ive, c2, k2, sizeof(k2), 118},
{CAM_ECB_DEC, pte, ive, c3, k3, sizeof(k3), -119}, {CAM_ECB_DEC, pte, ive, c3, k3, sizeof(k3), 119},
{CAM_CBC_ENC, ptc, ivc, c4, k4, sizeof(k4), -120}, {CAM_CBC_ENC, ptc, ivc, c4, k4, sizeof(k4), 120},
{CAM_CBC_ENC, ptc, ivc, c5, k5, sizeof(k5), -121}, {CAM_CBC_ENC, ptc, ivc, c5, k5, sizeof(k5), 121},
{CAM_CBC_ENC, ptc, ivc, c6, k6, sizeof(k6), -122}, {CAM_CBC_ENC, ptc, ivc, c6, k6, sizeof(k6), 122},
{CAM_CBC_DEC, ptc, ivc, c4, k4, sizeof(k4), -123}, {CAM_CBC_DEC, ptc, ivc, c4, k4, sizeof(k4), 123},
{CAM_CBC_DEC, ptc, ivc, c5, k5, sizeof(k5), -124}, {CAM_CBC_DEC, ptc, ivc, c5, k5, sizeof(k5), 124},
{CAM_CBC_DEC, ptc, ivc, c6, k6, sizeof(k6), -125} {CAM_CBC_DEC, ptc, ivc, c6, k6, sizeof(k6), 125}
}; };
int i, testsSz; int i, testsSz;
int ret; int ret;
@ -17178,7 +17178,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t camellia_test(void)
for (i = 0; i < testsSz; i++) { for (i = 0; i < testsSz; i++) {
if (wc_CamelliaSetKey(&cam, testVectors[i].key, testVectors[i].keySz, if (wc_CamelliaSetKey(&cam, testVectors[i].key, testVectors[i].keySz,
testVectors[i].iv) != 0) testVectors[i].iv) != 0)
return testVectors[i].errorCode; return WC_TEST_RET_ENC_I(testVectors[i].errorCode);
switch (testVectors[i].type) { switch (testVectors[i].type) {
case CAM_ECB_ENC: case CAM_ECB_ENC:
@ -17186,28 +17186,28 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t camellia_test(void)
testVectors[i].plaintext); testVectors[i].plaintext);
if (ret != 0 || XMEMCMP(out, testVectors[i].ciphertext, if (ret != 0 || XMEMCMP(out, testVectors[i].ciphertext,
WC_CAMELLIA_BLOCK_SIZE)) WC_CAMELLIA_BLOCK_SIZE))
return testVectors[i].errorCode; return WC_TEST_RET_ENC_I(testVectors[i].errorCode);
break; break;
case CAM_ECB_DEC: case CAM_ECB_DEC:
ret = wc_CamelliaDecryptDirect(&cam, out, ret = wc_CamelliaDecryptDirect(&cam, out,
testVectors[i].ciphertext); testVectors[i].ciphertext);
if (ret != 0 || XMEMCMP(out, testVectors[i].plaintext, if (ret != 0 || XMEMCMP(out, testVectors[i].plaintext,
WC_CAMELLIA_BLOCK_SIZE)) WC_CAMELLIA_BLOCK_SIZE))
return testVectors[i].errorCode; return WC_TEST_RET_ENC_I(testVectors[i].errorCode);
break; break;
case CAM_CBC_ENC: case CAM_CBC_ENC:
ret = wc_CamelliaCbcEncrypt(&cam, out, testVectors[i].plaintext, ret = wc_CamelliaCbcEncrypt(&cam, out, testVectors[i].plaintext,
WC_CAMELLIA_BLOCK_SIZE); WC_CAMELLIA_BLOCK_SIZE);
if (ret != 0 || XMEMCMP(out, testVectors[i].ciphertext, if (ret != 0 || XMEMCMP(out, testVectors[i].ciphertext,
WC_CAMELLIA_BLOCK_SIZE)) WC_CAMELLIA_BLOCK_SIZE))
return testVectors[i].errorCode; return WC_TEST_RET_ENC_I(testVectors[i].errorCode);
break; break;
case CAM_CBC_DEC: case CAM_CBC_DEC:
ret = wc_CamelliaCbcDecrypt(&cam, out, ret = wc_CamelliaCbcDecrypt(&cam, out,
testVectors[i].ciphertext, WC_CAMELLIA_BLOCK_SIZE); testVectors[i].ciphertext, WC_CAMELLIA_BLOCK_SIZE);
if (ret != 0 || XMEMCMP(out, testVectors[i].plaintext, if (ret != 0 || XMEMCMP(out, testVectors[i].plaintext,
WC_CAMELLIA_BLOCK_SIZE)) WC_CAMELLIA_BLOCK_SIZE))
return testVectors[i].errorCode; return WC_TEST_RET_ENC_I(testVectors[i].errorCode);
break; break;
default: default:
break; break;

8
wolfssl/wolfcrypt/types.h
View File

@ -150,9 +150,17 @@ decouple library dependencies with standard string, memory and so on.
/* The C standards don't define empty aggregates, but gcc and clang do. /* The C standards don't define empty aggregates, but gcc and clang do.
* We need to accommodate them for one of the same reasons C++ does -- * We need to accommodate them for one of the same reasons C++ does --
* conditionally empty aggregates, e.g. in hash.h. * conditionally empty aggregates, e.g. in hash.h.
*
* Nonetheless, in C++, empty aggregates wind up with size 1. If we use
* the [0] construct and the header is compiled by clang++, it warns
* "struct has size 0 in C, size 1 in C++ [-Wextern-c-compat]", despite
* the extern "C" wrapper. We sidestep this warning by recognizing
* here that C++ doesn't support truly empty aggregates. LLVM, for its part,
* deprecates compilation of C code as C++ using clang++.
*/ */
#if !defined(WOLF_C89) && defined(__GNUC__) && \ #if !defined(WOLF_C89) && defined(__GNUC__) && \
!defined(__STRICT_ANSI__) && \ !defined(__STRICT_ANSI__) && \
!defined(__cplusplus) && \
defined(HAVE_ANONYMOUS_INLINE_AGGREGATES) defined(HAVE_ANONYMOUS_INLINE_AGGREGATES)
#define HAVE_EMPTY_AGGREGATES 1 #define HAVE_EMPTY_AGGREGATES 1
#endif #endif