Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-29 20:56:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

crypto/siphash: avoid redefine name issue

Browse Source 
Rename siphash related symbols to avoid conflicts with compiler-generated
section names. Tricore-gcc produces function sections with '_end' suffix,
which conflicts with siphash_end symbol.

Signed-off-by: makejian <makejian@xiaomi.com>
This commit is contained in:
makejian
2025-05-28 11:06:10 +08:00
committed by Xiang Xiao
parent b01f8b04e9
commit cdfe81ff4c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto/siphash.c
+3 -3
View File
@@ -126,11 +126,11 @@ void siphash_final(FAR void *dst, FAR SIPHASH_CTX *ctx, int rc, int rf)
{
uint64_t r;
htolem64(&r, siphash_end(ctx, rc, rf));
htolem64(&r, siphash_finish(ctx, rc, rf));
memcpy(dst, &r, sizeof r);
}
uint64_t siphash_end(FAR SIPHASH_CTX *ctx, int rc, int rf)
uint64_t siphash_finish(FAR SIPHASH_CTX *ctx, int rc, int rf)
{
uint64_t r;
size_t left;
@@ -158,7 +158,7 @@ uint64_t siphash(FAR const SIPHASH_KEY *key,
siphash_init(&ctx, key);
siphash_update(&ctx, rc, rf, src, len);
return (siphash_end(&ctx, rc, rf));
return (siphash_finish(&ctx, rc, rf));
}
#define SIP_ROTL(x, b) ((x) << (b)) | ( (x) >> (64 - (b)))
include/crypto/siphash.h
+3 -3
View File
@@ -75,20 +75,20 @@ typedef struct
void siphash_init(FAR SIPHASH_CTX *, FAR const SIPHASH_KEY *);
void siphash_update(FAR SIPHASH_CTX *, int, int, FAR const void *, size_t);
uint64_t siphash_end(FAR SIPHASH_CTX *, int, int);
uint64_t siphash_finish(FAR SIPHASH_CTX *, int, int);
void siphash_final(FAR void *, FAR SIPHASH_CTX *, int, int);
uint64_t siphash(FAR const SIPHASH_KEY *,
int, int, FAR const void *, size_t);
#define SipHash24_Init(_c, _k) siphash_init((_c), (_k))
#define SipHash24_Update(_c, _p, _l) siphash_update((_c), 2, 4, (_p), (_l))
#define SipHash24_End(_d) siphash_end((_d), 2, 4)
#define SipHash24_Finish(_d) siphash_finish((_d), 2, 4)
#define SipHash24_Final(_d, _c) siphash_final((_d), (_c), 2, 4)
#define SipHash24(_k, _p, _l) siphash((_k), 2, 4, (_p), (_l))
#define SipHash48_Init(_c, _k) siphash_init((_c), (_k))
#define SipHash48_Update(_c, _p, _l) siphash_update((_c), 4, 8, (_p), (_l))
#define SipHash48_End(_d) siphash_end((_d), 4, 8)
#define SipHash48_Finish(_d) siphash_finish((_d), 4, 8)
#define SipHash48_Final(_d, _c) siphash_final((_d), (_c), 4, 8)
#define SipHash48(_k, _p, _l) siphash((_k), 4, 8, (_p), (_l))