feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #4618 from douzzer/wc-port-h-linuxkm-XSNPRINTF-XATOI

Browse Source 
linuxkm wc_port.h macro scoping fix
This commit is contained in:
David Garske
2021-11-30 08:25:06 -08:00
committed by GitHub
parent 78f4c84ee0 a33ae21801
commit 7a41089b12
15 changed files with 86 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/asn.c
View File

@@ -9817,6 +9817,8 @@ static int StoreEccKey(DecodedCert* cert, const byte* source, word32* srcIdx,
#if defined(WOLFSSL_RENESAS_SCEPROTECT) #if defined(WOLFSSL_RENESAS_SCEPROTECT)
cert->sigCtx.CertAtt.curve_id = ret; cert->sigCtx.CertAtt.curve_id = ret;
#else
(void)ret;
#endif #endif
/* key header */ /* key header */
ret = CheckBitString(source, srcIdx, &length, maxIdx, 1, NULL); ret = CheckBitString(source, srcIdx, &length, maxIdx, 1, NULL);

1
wolfcrypt/src/wc_port.c
View File

@@ -372,7 +372,6 @@ int wolfCrypt_Cleanup(void)
#else #else
#ifdef WOLFSSL_SCE #ifdef WOLFSSL_SCE
WOLFSSL_SCE_GSCE_HANDLE.p_api->close(WOLFSSL_SCE_GSCE_HANDLE.p_ctrl); WOLFSSL_SCE_GSCE_HANDLE.p_api->close(WOLFSSL_SCE_GSCE_HANDLE.p_ctrl);
#endif #endif
#endif #endif

4
wolfssl/test.h
View File

@@ -3652,9 +3652,9 @@ typedef struct PkCbInfo {
} PkCbInfo; } PkCbInfo;
#if defined(DEBUG_PK_CB) || defined(TEST_PK_PRIVKEY) #if defined(DEBUG_PK_CB) || defined(TEST_PK_PRIVKEY)
#define WOLFSSL_PKMSG(_f_, ...) printf(_f_, ##__VA_ARGS__) #define WOLFSSL_PKMSG(...) printf(__VA_ARGS__)
#else #else
#define WOLFSSL_PKMSG(_f_, ...) #define WOLFSSL_PKMSG(...)
#endif #endif
#ifdef HAVE_ECC #ifdef HAVE_ECC

0
wolfssl/wolfcrypt/port/Renesas/renesas_cmn.h Executable file → Normal file
View File

28
wolfssl/wolfcrypt/wc_port.h
View File

@@ -579,20 +579,6 @@
extern void fipsEntry(void); extern void fipsEntry(void);
#endif #endif
/* needed to suppress inclusion of stdio.h in wolfssl/wolfcrypt/types.h */
#define XSNPRINTF snprintf
/* the rigmarole around kstrtoll() here is to accommodate its warn-unused-result attribute. */
#define XATOI(s) ({ \
long long _xatoi_res = 0; \
int _xatoi_ret = kstrtoll(s, 10, &_xatoi_res); \
if (_xatoi_ret != 0) { \
_xatoi_res = 0; \
} \
(int)_xatoi_res; \
})
/* suppress false-positive "writing 1 byte into a region of size 0" warnings /* suppress false-positive "writing 1 byte into a region of size 0" warnings
* building old kernels with new gcc: * building old kernels with new gcc:
*/ */
@@ -602,6 +588,20 @@
#endif /* BUILDING_WOLFSSL */ #endif /* BUILDING_WOLFSSL */
/* needed to suppress inclusion of stdio.h in wolfssl/wolfcrypt/types.h */
#define XSNPRINTF snprintf
/* the rigmarole around kstrtoll() here is to accommodate its warn-unused-result attribute. */
/* also needed to suppress inclusion of stdlib.h in wolfssl/wolfcrypt/types.h */
#define XATOI(s) ({ \
long long _xatoi_res = 0; \
int _xatoi_ret = kstrtoll(s, 10, &_xatoi_res); \
if (_xatoi_ret != 0) { \
_xatoi_res = 0; \
} \
(int)_xatoi_res; \
})
#endif /* WOLFSSL_LINUXKM */ #endif /* WOLFSSL_LINUXKM */
/* THREADING/MUTEX SECTION */ /* THREADING/MUTEX SECTION */