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

Merge pull request #8484 from jmalak/offsetof

Browse Source 
Rename OFFSETOF macro to WolfSSL specific WC_OFFSETOF name
This commit is contained in:
Daniel Pouzzner
2025-02-23 14:45:43 -06:00
committed by GitHub
parent 29c3ffb5ee 1d1ab2d9ff
commit 0116ab6ca2
6 changed files with 91 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/crl.c
View File

@ -898,7 +898,7 @@ static RevokedCert *DupRevokedCertList(RevokedCert* in, void* heap)
static CRL_Entry* DupCRL_Entry(const CRL_Entry* ent, void* heap) static CRL_Entry* DupCRL_Entry(const CRL_Entry* ent, void* heap)
{ {
CRL_Entry *dupl; CRL_Entry *dupl;
const size_t copyOffset = OFFSETOF(CRL_Entry, verifyMutex) + const size_t copyOffset = WC_OFFSETOF(CRL_Entry, verifyMutex) +
sizeof(ent->verifyMutex); sizeof(ent->verifyMutex);
#ifdef CRL_STATIC_REVOKED_LIST #ifdef CRL_STATIC_REVOKED_LIST
if (ent->totalCerts > CRL_MAX_REVOKED_CERTS) { if (ent->totalCerts > CRL_MAX_REVOKED_CERTS) {

2
src/internal.c
View File

@ -9471,7 +9471,7 @@ static void DtlsMsgAssembleCompleteMessage(DtlsMsg* msg)
* alignment of char. * alignment of char.
*/ */
dtls = (DtlsHandShakeHeader*)(void *)((char *)msg->fragBucketList dtls = (DtlsHandShakeHeader*)(void *)((char *)msg->fragBucketList
+ OFFSETOF(DtlsFragBucket,buf) + WC_OFFSETOF(DtlsFragBucket,buf)
- DTLS_HANDSHAKE_HEADER_SZ); - DTLS_HANDSHAKE_HEADER_SZ);
msg->fragBucketList = NULL; msg->fragBucketList = NULL;

2
src/ssl_sess.c
View File

@ -3757,7 +3757,7 @@ static int wolfSSL_DupSessionEx(const WOLFSSL_SESSION* input,
word16 ticLenAlloc = 0; word16 ticLenAlloc = 0;
byte *ticBuff = NULL; byte *ticBuff = NULL;
#endif #endif
const size_t copyOffset = OFFSETOF(WOLFSSL_SESSION, heap) + const size_t copyOffset = WC_OFFSETOF(WOLFSSL_SESSION, heap) +
sizeof(input->heap); sizeof(input->heap);
int ret = WOLFSSL_SUCCESS; int ret = WOLFSSL_SUCCESS;

160
wolfcrypt/src/asn.c
View File

@ -6594,16 +6594,16 @@ static int DecodeRsaPssParams(const byte* params, word32 sz,
defined(WOLFSSL_KCAPI_RSA) || defined(WOLFSSL_SE050))) defined(WOLFSSL_KCAPI_RSA) || defined(WOLFSSL_SE050)))
/* Byte offset of numbers in RSA key. */ /* Byte offset of numbers in RSA key. */
size_t rsaIntOffset[] = { size_t rsaIntOffset[] = {
OFFSETOF(RsaKey, n), WC_OFFSETOF(RsaKey, n),
OFFSETOF(RsaKey, e), WC_OFFSETOF(RsaKey, e),
#ifndef WOLFSSL_RSA_PUBLIC_ONLY #ifndef WOLFSSL_RSA_PUBLIC_ONLY
OFFSETOF(RsaKey, d), WC_OFFSETOF(RsaKey, d),
OFFSETOF(RsaKey, p), WC_OFFSETOF(RsaKey, p),
OFFSETOF(RsaKey, q), WC_OFFSETOF(RsaKey, q),
#if defined(WOLFSSL_KEY_GEN) || defined(OPENSSL_EXTRA) || !defined(RSA_LOW_MEM) #if defined(WOLFSSL_KEY_GEN) || defined(OPENSSL_EXTRA) || !defined(RSA_LOW_MEM)
OFFSETOF(RsaKey, dP), WC_OFFSETOF(RsaKey, dP),
OFFSETOF(RsaKey, dQ), WC_OFFSETOF(RsaKey, dQ),
OFFSETOF(RsaKey, u) WC_OFFSETOF(RsaKey, u)
#endif #endif
#endif #endif
}; };
@ -13097,13 +13097,13 @@ static const CertNameData certNameSubject[] = {
{ {
"/CN=", 4, "/CN=", 4,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectCN), WC_OFFSETOF(DecodedCert, subjectCN),
OFFSETOF(DecodedCert, subjectCNLen), WC_OFFSETOF(DecodedCert, subjectCNLen),
OFFSETOF(DecodedCert, subjectCNEnc), WC_OFFSETOF(DecodedCert, subjectCNEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
OFFSETOF(DecodedCert, issuerCN), WC_OFFSETOF(DecodedCert, issuerCN),
OFFSETOF(DecodedCert, issuerCNLen), WC_OFFSETOF(DecodedCert, issuerCNLen),
OFFSETOF(DecodedCert, issuerCNEnc), WC_OFFSETOF(DecodedCert, issuerCNEnc),
#endif #endif
#endif #endif
#ifdef WOLFSSL_X509_NAME_AVAILABLE #ifdef WOLFSSL_X509_NAME_AVAILABLE
@ -13114,13 +13114,13 @@ static const CertNameData certNameSubject[] = {
{ {
"/SN=", 4, "/SN=", 4,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectSN), WC_OFFSETOF(DecodedCert, subjectSN),
OFFSETOF(DecodedCert, subjectSNLen), WC_OFFSETOF(DecodedCert, subjectSNLen),
OFFSETOF(DecodedCert, subjectSNEnc), WC_OFFSETOF(DecodedCert, subjectSNEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
OFFSETOF(DecodedCert, issuerSN), WC_OFFSETOF(DecodedCert, issuerSN),
OFFSETOF(DecodedCert, issuerSNLen), WC_OFFSETOF(DecodedCert, issuerSNLen),
OFFSETOF(DecodedCert, issuerSNEnc), WC_OFFSETOF(DecodedCert, issuerSNEnc),
#endif #endif
#endif #endif
#ifdef WOLFSSL_X509_NAME_AVAILABLE #ifdef WOLFSSL_X509_NAME_AVAILABLE
@ -13131,13 +13131,13 @@ static const CertNameData certNameSubject[] = {
{ {
"/serialNumber=", 14, "/serialNumber=", 14,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectSND), WC_OFFSETOF(DecodedCert, subjectSND),
OFFSETOF(DecodedCert, subjectSNDLen), WC_OFFSETOF(DecodedCert, subjectSNDLen),
OFFSETOF(DecodedCert, subjectSNDEnc), WC_OFFSETOF(DecodedCert, subjectSNDEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
OFFSETOF(DecodedCert, issuerSND), WC_OFFSETOF(DecodedCert, issuerSND),
OFFSETOF(DecodedCert, issuerSNDLen), WC_OFFSETOF(DecodedCert, issuerSNDLen),
OFFSETOF(DecodedCert, issuerSNDEnc), WC_OFFSETOF(DecodedCert, issuerSNDEnc),
#endif #endif
#endif #endif
#ifdef WOLFSSL_X509_NAME_AVAILABLE #ifdef WOLFSSL_X509_NAME_AVAILABLE
@ -13148,13 +13148,13 @@ static const CertNameData certNameSubject[] = {
{ {
"/C=", 3, "/C=", 3,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectC), WC_OFFSETOF(DecodedCert, subjectC),
OFFSETOF(DecodedCert, subjectCLen), WC_OFFSETOF(DecodedCert, subjectCLen),
OFFSETOF(DecodedCert, subjectCEnc), WC_OFFSETOF(DecodedCert, subjectCEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
OFFSETOF(DecodedCert, issuerC), WC_OFFSETOF(DecodedCert, issuerC),
OFFSETOF(DecodedCert, issuerCLen), WC_OFFSETOF(DecodedCert, issuerCLen),
OFFSETOF(DecodedCert, issuerCEnc), WC_OFFSETOF(DecodedCert, issuerCEnc),
#endif #endif
#endif #endif
#ifdef WOLFSSL_X509_NAME_AVAILABLE #ifdef WOLFSSL_X509_NAME_AVAILABLE
@ -13165,13 +13165,13 @@ static const CertNameData certNameSubject[] = {
{ {
"/L=", 3, "/L=", 3,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectL), WC_OFFSETOF(DecodedCert, subjectL),
OFFSETOF(DecodedCert, subjectLLen), WC_OFFSETOF(DecodedCert, subjectLLen),
OFFSETOF(DecodedCert, subjectLEnc), WC_OFFSETOF(DecodedCert, subjectLEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
OFFSETOF(DecodedCert, issuerL), WC_OFFSETOF(DecodedCert, issuerL),
OFFSETOF(DecodedCert, issuerLLen), WC_OFFSETOF(DecodedCert, issuerLLen),
OFFSETOF(DecodedCert, issuerLEnc), WC_OFFSETOF(DecodedCert, issuerLEnc),
#endif #endif
#endif #endif
#ifdef WOLFSSL_X509_NAME_AVAILABLE #ifdef WOLFSSL_X509_NAME_AVAILABLE
@ -13182,13 +13182,13 @@ static const CertNameData certNameSubject[] = {
{ {
"/ST=", 4, "/ST=", 4,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectST), WC_OFFSETOF(DecodedCert, subjectST),
OFFSETOF(DecodedCert, subjectSTLen), WC_OFFSETOF(DecodedCert, subjectSTLen),
OFFSETOF(DecodedCert, subjectSTEnc), WC_OFFSETOF(DecodedCert, subjectSTEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
OFFSETOF(DecodedCert, issuerST), WC_OFFSETOF(DecodedCert, issuerST),
OFFSETOF(DecodedCert, issuerSTLen), WC_OFFSETOF(DecodedCert, issuerSTLen),
OFFSETOF(DecodedCert, issuerSTEnc), WC_OFFSETOF(DecodedCert, issuerSTEnc),
#endif #endif
#endif #endif
#ifdef WOLFSSL_X509_NAME_AVAILABLE #ifdef WOLFSSL_X509_NAME_AVAILABLE
@ -13199,9 +13199,9 @@ static const CertNameData certNameSubject[] = {
{ {
"/street=", 8, "/street=", 8,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectStreet), WC_OFFSETOF(DecodedCert, subjectStreet),
OFFSETOF(DecodedCert, subjectStreetLen), WC_OFFSETOF(DecodedCert, subjectStreetLen),
OFFSETOF(DecodedCert, subjectStreetEnc), WC_OFFSETOF(DecodedCert, subjectStreetEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
0, 0,
0, 0,
@ -13216,13 +13216,13 @@ static const CertNameData certNameSubject[] = {
{ {
"/O=", 3, "/O=", 3,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectO), WC_OFFSETOF(DecodedCert, subjectO),
OFFSETOF(DecodedCert, subjectOLen), WC_OFFSETOF(DecodedCert, subjectOLen),
OFFSETOF(DecodedCert, subjectOEnc), WC_OFFSETOF(DecodedCert, subjectOEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
OFFSETOF(DecodedCert, issuerO), WC_OFFSETOF(DecodedCert, issuerO),
OFFSETOF(DecodedCert, issuerOLen), WC_OFFSETOF(DecodedCert, issuerOLen),
OFFSETOF(DecodedCert, issuerOEnc), WC_OFFSETOF(DecodedCert, issuerOEnc),
#endif #endif
#endif #endif
#ifdef WOLFSSL_X509_NAME_AVAILABLE #ifdef WOLFSSL_X509_NAME_AVAILABLE
@ -13233,13 +13233,13 @@ static const CertNameData certNameSubject[] = {
{ {
"/OU=", 4, "/OU=", 4,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectOU), WC_OFFSETOF(DecodedCert, subjectOU),
OFFSETOF(DecodedCert, subjectOULen), WC_OFFSETOF(DecodedCert, subjectOULen),
OFFSETOF(DecodedCert, subjectOUEnc), WC_OFFSETOF(DecodedCert, subjectOUEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
OFFSETOF(DecodedCert, issuerOU), WC_OFFSETOF(DecodedCert, issuerOU),
OFFSETOF(DecodedCert, issuerOULen), WC_OFFSETOF(DecodedCert, issuerOULen),
OFFSETOF(DecodedCert, issuerOUEnc), WC_OFFSETOF(DecodedCert, issuerOUEnc),
#endif #endif
#endif #endif
#ifdef WOLFSSL_X509_NAME_AVAILABLE #ifdef WOLFSSL_X509_NAME_AVAILABLE
@ -13301,9 +13301,9 @@ static const CertNameData certNameSubject[] = {
{ {
"/businessCategory=", 18, "/businessCategory=", 18,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectBC), WC_OFFSETOF(DecodedCert, subjectBC),
OFFSETOF(DecodedCert, subjectBCLen), WC_OFFSETOF(DecodedCert, subjectBCLen),
OFFSETOF(DecodedCert, subjectBCEnc), WC_OFFSETOF(DecodedCert, subjectBCEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
0, 0,
0, 0,
@ -13335,9 +13335,9 @@ static const CertNameData certNameSubject[] = {
{ {
"/postalCode=", 12, "/postalCode=", 12,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectPC), WC_OFFSETOF(DecodedCert, subjectPC),
OFFSETOF(DecodedCert, subjectPCLen), WC_OFFSETOF(DecodedCert, subjectPCLen),
OFFSETOF(DecodedCert, subjectPCEnc), WC_OFFSETOF(DecodedCert, subjectPCEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
0, 0,
0, 0,
@ -13352,9 +13352,9 @@ static const CertNameData certNameSubject[] = {
{ {
"/userid=", 8, "/userid=", 8,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectUID), WC_OFFSETOF(DecodedCert, subjectUID),
OFFSETOF(DecodedCert, subjectUIDLen), WC_OFFSETOF(DecodedCert, subjectUIDLen),
OFFSETOF(DecodedCert, subjectUIDEnc), WC_OFFSETOF(DecodedCert, subjectUIDEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
0, 0,
0, 0,
@ -13370,9 +13370,9 @@ static const CertNameData certNameSubject[] = {
{ {
"/N=", 3, "/N=", 3,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectN), WC_OFFSETOF(DecodedCert, subjectN),
OFFSETOF(DecodedCert, subjectNLen), WC_OFFSETOF(DecodedCert, subjectNLen),
OFFSETOF(DecodedCert, subjectNEnc), WC_OFFSETOF(DecodedCert, subjectNEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
0, 0,
0, 0,
@ -13387,9 +13387,9 @@ static const CertNameData certNameSubject[] = {
{ {
"/GN=", 4, "/GN=", 4,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectGN), WC_OFFSETOF(DecodedCert, subjectGN),
OFFSETOF(DecodedCert, subjectGNLen), WC_OFFSETOF(DecodedCert, subjectGNLen),
OFFSETOF(DecodedCert, subjectGNEnc), WC_OFFSETOF(DecodedCert, subjectGNEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
0, 0,
0, 0,
@ -13404,9 +13404,9 @@ static const CertNameData certNameSubject[] = {
{ {
"/initials=", 10, "/initials=", 10,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectI), WC_OFFSETOF(DecodedCert, subjectI),
OFFSETOF(DecodedCert, subjectILen), WC_OFFSETOF(DecodedCert, subjectILen),
OFFSETOF(DecodedCert, subjectIEnc), WC_OFFSETOF(DecodedCert, subjectIEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
0, 0,
0, 0,
@ -13421,9 +13421,9 @@ static const CertNameData certNameSubject[] = {
{ {
"/dnQualifier=", 13, "/dnQualifier=", 13,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectDNQ), WC_OFFSETOF(DecodedCert, subjectDNQ),
OFFSETOF(DecodedCert, subjectDNQLen), WC_OFFSETOF(DecodedCert, subjectDNQLen),
OFFSETOF(DecodedCert, subjectDNQEnc), WC_OFFSETOF(DecodedCert, subjectDNQEnc),
#ifdef WOLFSSL_HAVE_ISSUER_NAMES #ifdef WOLFSSL_HAVE_ISSUER_NAMES
0, 0,
0, 0,

4
wolfssl/openssl/asn1.h
View File

@ -219,11 +219,11 @@ typedef struct WOLFSSL_ASN1_ITEM WOLFSSL_ASN1_ITEM;
mtype##_member_data, \ mtype##_member_data, \
sizeof(mtype##_member_data) / sizeof(WOLFSSL_ASN1_TEMPLATE), \ sizeof(mtype##_member_data) / sizeof(WOLFSSL_ASN1_TEMPLATE), \
sizeof(mtype) ,\ sizeof(mtype) ,\
OFFSETOF(mtype, type) \ WC_OFFSETOF(mtype, type) \
}; };
#define ASN1_TYPE(type, member, tag, first_byte, exp, seq) \ #define ASN1_TYPE(type, member, tag, first_byte, exp, seq) \
OFFSETOF(type, member), tag, first_byte, exp, seq WC_OFFSETOF(type, member), tag, first_byte, exp, seq
/* Function callbacks need to be defined immediately otherwise we will /* Function callbacks need to be defined immediately otherwise we will
* incorrectly expand the type. Ex: ASN1_INTEGER -> WOLFSSL_ASN1_INTEGER */ * incorrectly expand the type. Ex: ASN1_INTEGER -> WOLFSSL_ASN1_INTEGER */

13
wolfssl/wolfcrypt/types.h
View File

@ -1004,15 +1004,14 @@ typedef struct w64wrapper {
#define XTOLOWER(c) tolower((c)) #define XTOLOWER(c) tolower((c))
#endif #endif
#ifdef __WATCOMC__ #ifndef WC_OFFSETOF
/* avoid OFFSETOF conflict in os2def.h */
#undef OFFSETOF
#endif
#ifndef OFFSETOF
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 4)) #if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 4))
#define OFFSETOF(type, field) __builtin_offsetof(type, field) #define WC_OFFSETOF(type, field) __builtin_offsetof(type, field)
#elif defined(__WATCOMC__)
#include <stddef.h>
#define WC_OFFSETOF offsetof
#else #else
#define OFFSETOF(type, field) ((size_t)&(((type *)0)->field)) #define WC_OFFSETOF(type, field) ((size_t)&(((type *)0)->field))
#endif #endif
#endif #endif