AuroraMiddleware/libtomcrypt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add LTC_ALIGN_BUF()

Browse Source 
Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
This commit is contained in:
Steffen Jaeckel 2023-10-05 10:26:05 +02:00 committed by Jamie Reece Wilson
parent f39db7cb0a
commit 62add4d0ce
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/gcm-file/gcm_filehandle.c
View File

@ -98,9 +98,7 @@ int gcm_filehandle( int cipher,
* but again it's only for SSE2 anyways, so who cares? * but again it's only for SSE2 anyways, so who cares?
*/ */
#ifdef LTC_GCM_TABLES_SSE2 #ifdef LTC_GCM_TABLES_SSE2
if ((unsigned long)gcm & 15) { gcm = LTC_ALIGN_BUF(gcm, 16);
gcm = (gcm_state *)((unsigned long)gcm + (16 - ((unsigned long)gcm & 15)));
}
#endif #endif
if ((err = gcm_init(gcm, cipher, key, keylen)) != CRYPT_OK) { if ((err = gcm_init(gcm, cipher, key, keylen)) != CRYPT_OK) {

4
src/encauth/gcm/gcm_memory.c
View File

@ -70,9 +70,7 @@ int gcm_memory( int cipher,
* but again it's only for SSE2 anyways, so who cares? * but again it's only for SSE2 anyways, so who cares?
*/ */
#ifdef LTC_GCM_TABLES_SSE2 #ifdef LTC_GCM_TABLES_SSE2
if ((unsigned long)gcm & 15) { gcm = LTC_ALIGN_BUF(gcm, 16);
gcm = (gcm_state *)((unsigned long)gcm + (16 - ((unsigned long)gcm & 15)));
}
#endif #endif
if ((err = gcm_init(gcm, cipher, key, keylen)) != CRYPT_OK) { if ((err = gcm_init(gcm, cipher, key, keylen)) != CRYPT_OK) {

2
src/headers/tomcrypt_cfg.h
View File

@ -209,7 +209,7 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const char *s1, const char *s2);
typedef unsigned __int64 ulong64; typedef unsigned __int64 ulong64;
typedef __int64 long64; typedef __int64 long64;
#else #else
#define CONST64(n) n ## ULL #define CONST64(n) n ## uLL
typedef unsigned long long ulong64; typedef unsigned long long ulong64;
typedef long long long64; typedef long long long64;
#endif #endif

21
src/headers/tomcrypt_private.h
View File

@ -6,9 +6,30 @@
/* /*
* Internal Macros * Internal Macros
*/ */
/* Static assertion */
#define LTC_STATIC_ASSERT(msg, cond) typedef char ltc_static_assert_##msg[(cond) ? 1 : -1];
#define LTC_PAD_MASK (0xF000U) #define LTC_PAD_MASK (0xF000U)
#if defined(ENDIAN_64BITWORD)
#define CONSTPTR(n) CONST64(n)
#else
#define CONSTPTR(n) n ## uL
#endif
LTC_STATIC_ASSERT(correct_CONSTPTR_size, sizeof(CONSTPTR(1)) == sizeof(void*))
/* Poor-man's `uintptr_t` since we can't use stdint.h
* c.f. https://github.com/DCIT/perl-CryptX/issues/95#issuecomment-1745280962 */
typedef size_t ltc_uintptr;
LTC_STATIC_ASSERT(correct_ltc_uintptr_size, sizeof(ltc_uintptr) == sizeof(void*))
/* Aligns a `unsigned char` buffer `buf` to `n` bytes and returns that aligned address.
* Make sure that the buffer that is passed is huge enough.
*/
#define LTC_ALIGN_BUF(buf, n) ((void*)((ltc_uintptr)&((unsigned char*)(buf))[n - 1] & (~(CONSTPTR(n) - CONSTPTR(1)))))
/* `NULL` as defined by the standard is not guaranteed to be of a pointer /* `NULL` as defined by the standard is not guaranteed to be of a pointer
* type. In order to make sure that in vararg API's a pointer type is used, * type. In order to make sure that in vararg API's a pointer type is used,
* define our own version and use that one internally. * define our own version and use that one internally.