Skip to content

Commit 0116ab6

Browse files
douzzerdouzzer
authored
Merge pull request wolfSSL#8484 from jmalak/offsetof
Rename OFFSETOF macro to WolfSSL specific WC_OFFSETOF name
2 parents 29c3ffb + 1d1ab2d commit 0116ab6

File tree

6 files changed

+91
-92
lines changed

6 files changed

+91
-92
lines changed

‎src/crl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@ static RevokedCert *DupRevokedCertList(RevokedCert* in, void* heap)
898898
static CRL_Entry* DupCRL_Entry(const CRL_Entry* ent, void* heap)
899899
{
900900
CRL_Entry *dupl;
901-
const size_t copyOffset = OFFSETOF(CRL_Entry, verifyMutex) +
901+
const size_t copyOffset = WC_OFFSETOF(CRL_Entry, verifyMutex) +
902902
sizeof(ent->verifyMutex);
903903
#ifdef CRL_STATIC_REVOKED_LIST
904904
if (ent->totalCerts > CRL_MAX_REVOKED_CERTS) {

‎src/internal.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9471,7 +9471,7 @@ static void DtlsMsgAssembleCompleteMessage(DtlsMsg* msg)
94719471
* alignment of char.
94729472
*/
94739473
dtls = (DtlsHandShakeHeader*)(void *)((char *)msg->fragBucketList
9474-
+ OFFSETOF(DtlsFragBucket,buf)
9474+
+ WC_OFFSETOF(DtlsFragBucket,buf)
94759475
- DTLS_HANDSHAKE_HEADER_SZ);
94769476

94779477
msg->fragBucketList = NULL;

‎src/ssl_sess.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3757,7 +3757,7 @@ static int wolfSSL_DupSessionEx(const WOLFSSL_SESSION* input,
37573757
word16 ticLenAlloc = 0;
37583758
byte *ticBuff = NULL;
37593759
#endif
3760-
const size_t copyOffset = OFFSETOF(WOLFSSL_SESSION, heap) +
3760+
const size_t copyOffset = WC_OFFSETOF(WOLFSSL_SESSION, heap) +
37613761
sizeof(input->heap);
37623762
int ret = WOLFSSL_SUCCESS;
37633763

‎wolfcrypt/src/asn.c‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -6594,16 +6594,16 @@ static int DecodeRsaPssParams(const byte* params, word32 sz,
65946594
defined(WOLFSSL_KCAPI_RSA) || defined(WOLFSSL_SE050)))
65956595
/* Byte offset of numbers in RSA key. */
65966596
size_t rsaIntOffset[] = {
6597-
OFFSETOF(RsaKey, n),
6598-
OFFSETOF(RsaKey, e),
6597+
WC_OFFSETOF(RsaKey, n),
6598+
WC_OFFSETOF(RsaKey, e),
65996599
#ifndef WOLFSSL_RSA_PUBLIC_ONLY
6600-
OFFSETOF(RsaKey, d),
6601-
OFFSETOF(RsaKey, p),
6602-
OFFSETOF(RsaKey, q),
6600+
WC_OFFSETOF(RsaKey, d),
6601+
WC_OFFSETOF(RsaKey, p),
6602+
WC_OFFSETOF(RsaKey, q),
66036603
#if defined(WOLFSSL_KEY_GEN) || defined(OPENSSL_EXTRA) || !defined(RSA_LOW_MEM)
6604-
OFFSETOF(RsaKey, dP),
6605-
OFFSETOF(RsaKey, dQ),
6606-
OFFSETOF(RsaKey, u)
6604+
WC_OFFSETOF(RsaKey, dP),
6605+
WC_OFFSETOF(RsaKey, dQ),
6606+
WC_OFFSETOF(RsaKey, u)
66076607
#endif
66086608
#endif
66096609
};
@@ -13097,13 +13097,13 @@ static const CertNameData certNameSubject[] = {
1309713097
{
1309813098
"/CN=", 4,
1309913099
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13100-
OFFSETOF(DecodedCert, subjectCN),
13101-
OFFSETOF(DecodedCert, subjectCNLen),
13102-
OFFSETOF(DecodedCert, subjectCNEnc),
13100+
WC_OFFSETOF(DecodedCert, subjectCN),
13101+
WC_OFFSETOF(DecodedCert, subjectCNLen),
13102+
WC_OFFSETOF(DecodedCert, subjectCNEnc),
1310313103
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
13104-
OFFSETOF(DecodedCert, issuerCN),
13105-
OFFSETOF(DecodedCert, issuerCNLen),
13106-
OFFSETOF(DecodedCert, issuerCNEnc),
13104+
WC_OFFSETOF(DecodedCert, issuerCN),
13105+
WC_OFFSETOF(DecodedCert, issuerCNLen),
13106+
WC_OFFSETOF(DecodedCert, issuerCNEnc),
1310713107
#endif
1310813108
#endif
1310913109
#ifdef WOLFSSL_X509_NAME_AVAILABLE
@@ -13114,13 +13114,13 @@ static const CertNameData certNameSubject[] = {
1311413114
{
1311513115
"/SN=", 4,
1311613116
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13117-
OFFSETOF(DecodedCert, subjectSN),
13118-
OFFSETOF(DecodedCert, subjectSNLen),
13119-
OFFSETOF(DecodedCert, subjectSNEnc),
13117+
WC_OFFSETOF(DecodedCert, subjectSN),
13118+
WC_OFFSETOF(DecodedCert, subjectSNLen),
13119+
WC_OFFSETOF(DecodedCert, subjectSNEnc),
1312013120
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
13121-
OFFSETOF(DecodedCert, issuerSN),
13122-
OFFSETOF(DecodedCert, issuerSNLen),
13123-
OFFSETOF(DecodedCert, issuerSNEnc),
13121+
WC_OFFSETOF(DecodedCert, issuerSN),
13122+
WC_OFFSETOF(DecodedCert, issuerSNLen),
13123+
WC_OFFSETOF(DecodedCert, issuerSNEnc),
1312413124
#endif
1312513125
#endif
1312613126
#ifdef WOLFSSL_X509_NAME_AVAILABLE
@@ -13131,13 +13131,13 @@ static const CertNameData certNameSubject[] = {
1313113131
{
1313213132
"/serialNumber=", 14,
1313313133
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13134-
OFFSETOF(DecodedCert, subjectSND),
13135-
OFFSETOF(DecodedCert, subjectSNDLen),
13136-
OFFSETOF(DecodedCert, subjectSNDEnc),
13134+
WC_OFFSETOF(DecodedCert, subjectSND),
13135+
WC_OFFSETOF(DecodedCert, subjectSNDLen),
13136+
WC_OFFSETOF(DecodedCert, subjectSNDEnc),
1313713137
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
13138-
OFFSETOF(DecodedCert, issuerSND),
13139-
OFFSETOF(DecodedCert, issuerSNDLen),
13140-
OFFSETOF(DecodedCert, issuerSNDEnc),
13138+
WC_OFFSETOF(DecodedCert, issuerSND),
13139+
WC_OFFSETOF(DecodedCert, issuerSNDLen),
13140+
WC_OFFSETOF(DecodedCert, issuerSNDEnc),
1314113141
#endif
1314213142
#endif
1314313143
#ifdef WOLFSSL_X509_NAME_AVAILABLE
@@ -13148,13 +13148,13 @@ static const CertNameData certNameSubject[] = {
1314813148
{
1314913149
"/C=", 3,
1315013150
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13151-
OFFSETOF(DecodedCert, subjectC),
13152-
OFFSETOF(DecodedCert, subjectCLen),
13153-
OFFSETOF(DecodedCert, subjectCEnc),
13151+
WC_OFFSETOF(DecodedCert, subjectC),
13152+
WC_OFFSETOF(DecodedCert, subjectCLen),
13153+
WC_OFFSETOF(DecodedCert, subjectCEnc),
1315413154
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
13155-
OFFSETOF(DecodedCert, issuerC),
13156-
OFFSETOF(DecodedCert, issuerCLen),
13157-
OFFSETOF(DecodedCert, issuerCEnc),
13155+
WC_OFFSETOF(DecodedCert, issuerC),
13156+
WC_OFFSETOF(DecodedCert, issuerCLen),
13157+
WC_OFFSETOF(DecodedCert, issuerCEnc),
1315813158
#endif
1315913159
#endif
1316013160
#ifdef WOLFSSL_X509_NAME_AVAILABLE
@@ -13165,13 +13165,13 @@ static const CertNameData certNameSubject[] = {
1316513165
{
1316613166
"/L=", 3,
1316713167
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13168-
OFFSETOF(DecodedCert, subjectL),
13169-
OFFSETOF(DecodedCert, subjectLLen),
13170-
OFFSETOF(DecodedCert, subjectLEnc),
13168+
WC_OFFSETOF(DecodedCert, subjectL),
13169+
WC_OFFSETOF(DecodedCert, subjectLLen),
13170+
WC_OFFSETOF(DecodedCert, subjectLEnc),
1317113171
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
13172-
OFFSETOF(DecodedCert, issuerL),
13173-
OFFSETOF(DecodedCert, issuerLLen),
13174-
OFFSETOF(DecodedCert, issuerLEnc),
13172+
WC_OFFSETOF(DecodedCert, issuerL),
13173+
WC_OFFSETOF(DecodedCert, issuerLLen),
13174+
WC_OFFSETOF(DecodedCert, issuerLEnc),
1317513175
#endif
1317613176
#endif
1317713177
#ifdef WOLFSSL_X509_NAME_AVAILABLE
@@ -13182,13 +13182,13 @@ static const CertNameData certNameSubject[] = {
1318213182
{
1318313183
"/ST=", 4,
1318413184
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13185-
OFFSETOF(DecodedCert, subjectST),
13186-
OFFSETOF(DecodedCert, subjectSTLen),
13187-
OFFSETOF(DecodedCert, subjectSTEnc),
13185+
WC_OFFSETOF(DecodedCert, subjectST),
13186+
WC_OFFSETOF(DecodedCert, subjectSTLen),
13187+
WC_OFFSETOF(DecodedCert, subjectSTEnc),
1318813188
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
13189-
OFFSETOF(DecodedCert, issuerST),
13190-
OFFSETOF(DecodedCert, issuerSTLen),
13191-
OFFSETOF(DecodedCert, issuerSTEnc),
13189+
WC_OFFSETOF(DecodedCert, issuerST),
13190+
WC_OFFSETOF(DecodedCert, issuerSTLen),
13191+
WC_OFFSETOF(DecodedCert, issuerSTEnc),
1319213192
#endif
1319313193
#endif
1319413194
#ifdef WOLFSSL_X509_NAME_AVAILABLE
@@ -13199,9 +13199,9 @@ static const CertNameData certNameSubject[] = {
1319913199
{
1320013200
"/street=", 8,
1320113201
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13202-
OFFSETOF(DecodedCert, subjectStreet),
13203-
OFFSETOF(DecodedCert, subjectStreetLen),
13204-
OFFSETOF(DecodedCert, subjectStreetEnc),
13202+
WC_OFFSETOF(DecodedCert, subjectStreet),
13203+
WC_OFFSETOF(DecodedCert, subjectStreetLen),
13204+
WC_OFFSETOF(DecodedCert, subjectStreetEnc),
1320513205
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
1320613206
0,
1320713207
0,
@@ -13216,13 +13216,13 @@ static const CertNameData certNameSubject[] = {
1321613216
{
1321713217
"/O=", 3,
1321813218
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13219-
OFFSETOF(DecodedCert, subjectO),
13220-
OFFSETOF(DecodedCert, subjectOLen),
13221-
OFFSETOF(DecodedCert, subjectOEnc),
13219+
WC_OFFSETOF(DecodedCert, subjectO),
13220+
WC_OFFSETOF(DecodedCert, subjectOLen),
13221+
WC_OFFSETOF(DecodedCert, subjectOEnc),
1322213222
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
13223-
OFFSETOF(DecodedCert, issuerO),
13224-
OFFSETOF(DecodedCert, issuerOLen),
13225-
OFFSETOF(DecodedCert, issuerOEnc),
13223+
WC_OFFSETOF(DecodedCert, issuerO),
13224+
WC_OFFSETOF(DecodedCert, issuerOLen),
13225+
WC_OFFSETOF(DecodedCert, issuerOEnc),
1322613226
#endif
1322713227
#endif
1322813228
#ifdef WOLFSSL_X509_NAME_AVAILABLE
@@ -13233,13 +13233,13 @@ static const CertNameData certNameSubject[] = {
1323313233
{
1323413234
"/OU=", 4,
1323513235
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13236-
OFFSETOF(DecodedCert, subjectOU),
13237-
OFFSETOF(DecodedCert, subjectOULen),
13238-
OFFSETOF(DecodedCert, subjectOUEnc),
13236+
WC_OFFSETOF(DecodedCert, subjectOU),
13237+
WC_OFFSETOF(DecodedCert, subjectOULen),
13238+
WC_OFFSETOF(DecodedCert, subjectOUEnc),
1323913239
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
13240-
OFFSETOF(DecodedCert, issuerOU),
13241-
OFFSETOF(DecodedCert, issuerOULen),
13242-
OFFSETOF(DecodedCert, issuerOUEnc),
13240+
WC_OFFSETOF(DecodedCert, issuerOU),
13241+
WC_OFFSETOF(DecodedCert, issuerOULen),
13242+
WC_OFFSETOF(DecodedCert, issuerOUEnc),
1324313243
#endif
1324413244
#endif
1324513245
#ifdef WOLFSSL_X509_NAME_AVAILABLE
@@ -13301,9 +13301,9 @@ static const CertNameData certNameSubject[] = {
1330113301
{
1330213302
"/businessCategory=", 18,
1330313303
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13304-
OFFSETOF(DecodedCert, subjectBC),
13305-
OFFSETOF(DecodedCert, subjectBCLen),
13306-
OFFSETOF(DecodedCert, subjectBCEnc),
13304+
WC_OFFSETOF(DecodedCert, subjectBC),
13305+
WC_OFFSETOF(DecodedCert, subjectBCLen),
13306+
WC_OFFSETOF(DecodedCert, subjectBCEnc),
1330713307
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
1330813308
0,
1330913309
0,
@@ -13335,9 +13335,9 @@ static const CertNameData certNameSubject[] = {
1333513335
{
1333613336
"/postalCode=", 12,
1333713337
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13338-
OFFSETOF(DecodedCert, subjectPC),
13339-
OFFSETOF(DecodedCert, subjectPCLen),
13340-
OFFSETOF(DecodedCert, subjectPCEnc),
13338+
WC_OFFSETOF(DecodedCert, subjectPC),
13339+
WC_OFFSETOF(DecodedCert, subjectPCLen),
13340+
WC_OFFSETOF(DecodedCert, subjectPCEnc),
1334113341
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
1334213342
0,
1334313343
0,
@@ -13352,9 +13352,9 @@ static const CertNameData certNameSubject[] = {
1335213352
{
1335313353
"/userid=", 8,
1335413354
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13355-
OFFSETOF(DecodedCert, subjectUID),
13356-
OFFSETOF(DecodedCert, subjectUIDLen),
13357-
OFFSETOF(DecodedCert, subjectUIDEnc),
13355+
WC_OFFSETOF(DecodedCert, subjectUID),
13356+
WC_OFFSETOF(DecodedCert, subjectUIDLen),
13357+
WC_OFFSETOF(DecodedCert, subjectUIDEnc),
1335813358
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
1335913359
0,
1336013360
0,
@@ -13370,9 +13370,9 @@ static const CertNameData certNameSubject[] = {
1337013370
{
1337113371
"/N=", 3,
1337213372
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13373-
OFFSETOF(DecodedCert, subjectN),
13374-
OFFSETOF(DecodedCert, subjectNLen),
13375-
OFFSETOF(DecodedCert, subjectNEnc),
13373+
WC_OFFSETOF(DecodedCert, subjectN),
13374+
WC_OFFSETOF(DecodedCert, subjectNLen),
13375+
WC_OFFSETOF(DecodedCert, subjectNEnc),
1337613376
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
1337713377
0,
1337813378
0,
@@ -13387,9 +13387,9 @@ static const CertNameData certNameSubject[] = {
1338713387
{
1338813388
"/GN=", 4,
1338913389
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13390-
OFFSETOF(DecodedCert, subjectGN),
13391-
OFFSETOF(DecodedCert, subjectGNLen),
13392-
OFFSETOF(DecodedCert, subjectGNEnc),
13390+
WC_OFFSETOF(DecodedCert, subjectGN),
13391+
WC_OFFSETOF(DecodedCert, subjectGNLen),
13392+
WC_OFFSETOF(DecodedCert, subjectGNEnc),
1339313393
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
1339413394
0,
1339513395
0,
@@ -13404,9 +13404,9 @@ static const CertNameData certNameSubject[] = {
1340413404
{
1340513405
"/initials=", 10,
1340613406
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13407-
OFFSETOF(DecodedCert, subjectI),
13408-
OFFSETOF(DecodedCert, subjectILen),
13409-
OFFSETOF(DecodedCert, subjectIEnc),
13407+
WC_OFFSETOF(DecodedCert, subjectI),
13408+
WC_OFFSETOF(DecodedCert, subjectILen),
13409+
WC_OFFSETOF(DecodedCert, subjectIEnc),
1341013410
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
1341113411
0,
1341213412
0,
@@ -13421,9 +13421,9 @@ static const CertNameData certNameSubject[] = {
1342113421
{
1342213422
"/dnQualifier=", 13,
1342313423
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
13424-
OFFSETOF(DecodedCert, subjectDNQ),
13425-
OFFSETOF(DecodedCert, subjectDNQLen),
13426-
OFFSETOF(DecodedCert, subjectDNQEnc),
13424+
WC_OFFSETOF(DecodedCert, subjectDNQ),
13425+
WC_OFFSETOF(DecodedCert, subjectDNQLen),
13426+
WC_OFFSETOF(DecodedCert, subjectDNQEnc),
1342713427
#ifdef WOLFSSL_HAVE_ISSUER_NAMES
1342813428
0,
1342913429
0,

‎wolfssl/openssl/asn1.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,11 @@ typedef struct WOLFSSL_ASN1_ITEM WOLFSSL_ASN1_ITEM;
219219
mtype##_member_data, \
220220
sizeof(mtype##_member_data) / sizeof(WOLFSSL_ASN1_TEMPLATE), \
221221
sizeof(mtype) ,\
222-
OFFSETOF(mtype, type) \
222+
WC_OFFSETOF(mtype, type) \
223223
};
224224

225225
#define ASN1_TYPE(type, member, tag, first_byte, exp, seq) \
226-
OFFSETOF(type, member), tag, first_byte, exp, seq
226+
WC_OFFSETOF(type, member), tag, first_byte, exp, seq
227227

228228
/* Function callbacks need to be defined immediately otherwise we will
229229
* incorrectly expand the type. Ex: ASN1_INTEGER -> WOLFSSL_ASN1_INTEGER */

‎wolfssl/wolfcrypt/types.h‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,15 +1004,14 @@ typedef struct w64wrapper {
10041004
#define XTOLOWER(c) tolower((c))
10051005
#endif
10061006

1007-
#ifdef __WATCOMC__
1008-
/* avoid OFFSETOF conflict in os2def.h */
1009-
#undef OFFSETOF
1010-
#endif
1011-
#ifndef OFFSETOF
1007+
#ifndef WC_OFFSETOF
10121008
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 4))
1013-
#define OFFSETOF(type, field) __builtin_offsetof(type, field)
1009+
#define WC_OFFSETOF(type, field) __builtin_offsetof(type, field)
1010+
#elif defined(__WATCOMC__)
1011+
#include <stddef.h>
1012+
#define WC_OFFSETOF offsetof
10141013
#else
1015-
#define OFFSETOF(type, field) ((size_t)&(((type *)0)->field))
1014+
#define WC_OFFSETOF(type, field) ((size_t)&(((type *)0)->field))
10161015
#endif
10171016
#endif
10181017

0 commit comments

Comments
 (0)