Skip to content

Commit 8ecf064

Browse files
douzzerdouzzer
authored
Merge pull request wolfSSL#8098 from dgarske/x86_notwindows_2
More fixes for building x86 in Visual Studio for non-windows OS
2 parents 92f7e91 + aad0f6e commit 8ecf064

19 files changed

Lines changed: 74 additions & 55 deletions

File tree

‎src/ocsp.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1634,7 +1634,7 @@ int wolfSSL_OCSP_REQ_CTX_nbio(WOLFSSL_OCSP_REQ_CTX *ctx)
16341634
case ORIOS_WRITE:
16351635
{
16361636
const unsigned char *req;
1637-
int reqLen = wolfSSL_BIO_get_mem_data(ctx->reqResp, &req);
1637+
int reqLen = wolfSSL_BIO_get_mem_data(ctx->reqResp, (void*)&req);
16381638
if (reqLen <= 0) {
16391639
WOLFSSL_MSG("wolfSSL_BIO_get_mem_data error");
16401640
return WOLFSSL_FAILURE;
@@ -1710,7 +1710,7 @@ int wolfSSL_OCSP_sendreq_nbio(OcspResponse **presp, WOLFSSL_OCSP_REQ_CTX *ctx)
17101710
if (ret != WOLFSSL_SUCCESS)
17111711
return ret;
17121712

1713-
len = wolfSSL_BIO_get_mem_data(ctx->reqResp, &resp);
1713+
len = wolfSSL_BIO_get_mem_data(ctx->reqResp, (void*)&resp);
17141714
if (len <= 0)
17151715
return WOLFSSL_FAILURE;
17161716
return wolfSSL_d2i_OCSP_RESPONSE(presp, &resp, len) != NULL

‎src/ssl_asn1.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ static void* d2i_obj(const WOLFSSL_ASN1_TEMPLATE* mem, const byte** src,
456456
mem->free_func(ret); /* never a stack so we can call this directly */
457457
return NULL;
458458
}
459-
*len -= (tmp - *src);
459+
*len -= (long)(tmp - *src);
460460
*src = tmp;
461461
return ret;
462462
}
@@ -586,7 +586,7 @@ static void* d2i_generic(const WOLFSSL_ASN1_TEMPLATE* mem,
586586
WOLFSSL_MSG("ptr not advanced enough");
587587
goto error;
588588
}
589-
*len -= tmp - *src;
589+
*len -= (long)(tmp - *src);
590590
*src = tmp;
591591
return ret;
592592
error:

‎src/tls.c‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7168,15 +7168,16 @@ static int TLSX_CA_Names_Parse(WOLFSSL *ssl, const byte* input,
71687168
return 0;
71697169
}
71707170

7171-
#define CAN_GET_SIZE TLSX_CA_Names_GetSize
7172-
#define CAN_WRITE TLSX_CA_Names_Write
7173-
#define CAN_PARSE TLSX_CA_Names_Parse
7171+
#define CAN_GET_SIZE(data) TLSX_CA_Names_GetSize(data)
7172+
#define CAN_WRITE(data, output) TLSX_CA_Names_Write(data, output)
7173+
#define CAN_PARSE(ssl, input, length, isRequest) \
7174+
TLSX_CA_Names_Parse(ssl, input, length, isRequest)
71747175

71757176
#else
71767177

7177-
#define CAN_GET_SIZE(...) 0
7178-
#define CAN_WRITE(...) 0
7179-
#define CAN_PARSE(...) 0
7178+
#define CAN_GET_SIZE(data) 0
7179+
#define CAN_WRITE(data, output) 0
7180+
#define CAN_PARSE(ssl, input, length, isRequest) 0
71807181

71817182
#endif
71827183

@@ -14772,9 +14773,9 @@ static word16 TLSX_GetMinSize_Client(word16* type)
1477214773
return 0;
1477314774
}
1477414775
}
14775-
#define TLSX_GET_MIN_SIZE_CLIENT TLSX_GetMinSize_Client
14776+
#define TLSX_GET_MIN_SIZE_CLIENT(type) TLSX_GetMinSize_Client(type)
1477614777
#else
14777-
#define TLSX_GET_MIN_SIZE_CLIENT(...) 0
14778+
#define TLSX_GET_MIN_SIZE_CLIENT(type) 0
1477814779
#endif
1477914780

1478014781

@@ -14841,9 +14842,9 @@ static word16 TLSX_GetMinSize_Server(const word16 *type)
1484114842
return 0;
1484214843
}
1484314844
}
14844-
#define TLSX_GET_MIN_SIZE_SERVER TLSX_GetMinSize_Server
14845+
#define TLSX_GET_MIN_SIZE_SERVER(type) TLSX_GetMinSize_Server(type)
1484514846
#else
14846-
#define TLSX_GET_MIN_SIZE_SERVER(...) 0
14847+
#define TLSX_GET_MIN_SIZE_SERVER(type) 0
1484714848
#endif
1484814849

1484914850

‎src/x509.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5926,8 +5926,8 @@ static int X509PrintDirType(char * dst, int max_len, const DNS_entry * entry)
59265926
/* Copy it in, decrement available space. */
59275927
XSTRNCPY(dst, pfx, bytes_left);
59285928
dst += XSTRLEN(pfx);
5929-
total_len += XSTRLEN(pfx);
5930-
bytes_left -= XSTRLEN(pfx);
5929+
total_len += (int)XSTRLEN(pfx);
5930+
bytes_left -= (int)XSTRLEN(pfx);
59315931

59325932
if (fld_len > bytes_left) {
59335933
/* Not enough space left. */

‎wolfcrypt/src/curve25519.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#if defined(WOLFSSL_LINUXKM) && !defined(USE_INTEL_SPEEDUP)
5555
/* force off unneeded vector register save/restore. */
5656
#undef SAVE_VECTOR_REGISTERS
57-
#define SAVE_VECTOR_REGISTERS(...) WC_DO_NOTHING
57+
#define SAVE_VECTOR_REGISTERS(fail_clause) WC_DO_NOTHING
5858
#undef RESTORE_VECTOR_REGISTERS
5959
#define RESTORE_VECTOR_REGISTERS() WC_DO_NOTHING
6060
#endif

‎wolfcrypt/src/dh.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
#if defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_SP_ASM)
6868
/* force off unneeded vector register save/restore. */
6969
#undef SAVE_VECTOR_REGISTERS
70-
#define SAVE_VECTOR_REGISTERS(...) WC_DO_NOTHING
70+
#define SAVE_VECTOR_REGISTERS(fail_clause) WC_DO_NOTHING
7171
#undef RESTORE_VECTOR_REGISTERS
7272
#define RESTORE_VECTOR_REGISTERS() WC_DO_NOTHING
7373
#endif

‎wolfcrypt/src/dsa.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#if defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_SP_ASM)
4646
/* force off unneeded vector register save/restore. */
4747
#undef SAVE_VECTOR_REGISTERS
48-
#define SAVE_VECTOR_REGISTERS(...) WC_DO_NOTHING
48+
#define SAVE_VECTOR_REGISTERS(fail_clause) WC_DO_NOTHING
4949
#undef RESTORE_VECTOR_REGISTERS
5050
#define RESTORE_VECTOR_REGISTERS() WC_DO_NOTHING
5151
#endif

‎wolfcrypt/src/ecc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ ECC Curve Sizes:
231231
#if defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_SP_ASM)
232232
/* force off unneeded vector register save/restore. */
233233
#undef SAVE_VECTOR_REGISTERS
234-
#define SAVE_VECTOR_REGISTERS(...) WC_DO_NOTHING
234+
#define SAVE_VECTOR_REGISTERS(fail_clause) WC_DO_NOTHING
235235
#undef RESTORE_VECTOR_REGISTERS
236236
#define RESTORE_VECTOR_REGISTERS() WC_DO_NOTHING
237237
#endif

‎wolfcrypt/src/eccsi.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#if defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_SP_ASM)
4747
/* force off unneeded vector register save/restore. */
4848
#undef SAVE_VECTOR_REGISTERS
49-
#define SAVE_VECTOR_REGISTERS(...) WC_DO_NOTHING
49+
#define SAVE_VECTOR_REGISTERS(fail_clause) WC_DO_NOTHING
5050
#undef RESTORE_VECTOR_REGISTERS
5151
#define RESTORE_VECTOR_REGISTERS() WC_DO_NOTHING
5252
#endif

‎wolfcrypt/src/rsa.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RSA keys can be used to encrypt, decrypt, sign and verify data.
6363
#if defined(WOLFSSL_LINUXKM) && !defined(WOLFSSL_SP_ASM)
6464
/* force off unneeded vector register save/restore. */
6565
#undef SAVE_VECTOR_REGISTERS
66-
#define SAVE_VECTOR_REGISTERS(...) WC_DO_NOTHING
66+
#define SAVE_VECTOR_REGISTERS(fail_clause) WC_DO_NOTHING
6767
#undef RESTORE_VECTOR_REGISTERS
6868
#define RESTORE_VECTOR_REGISTERS() WC_DO_NOTHING
6969
#endif

0 commit comments

Comments
 (0)