wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

cast XMALLOC() return values assiduously, for Visual Studio compatibility.

Browse Source
This commit is contained in:
Daniel Pouzzner
2020-08-24 14:07:24 -05:00
parent 195b5d2d2c
commit 925afe3b74
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl.c
View File

@@ -4427,7 +4427,7 @@ int AddTrustedPeer(WOLFSSL_CERT_MANAGER* cm, DerBuffer** pDer, int verify)
else { else {
/* add trusted peer signature */ /* add trusted peer signature */
peerCert->sigLen = cert->sigLength; peerCert->sigLen = cert->sigLength;
peerCert->sig = XMALLOC(cert->sigLength, cm->heap, peerCert->sig = (byte *)XMALLOC(cert->sigLength, cm->heap,
DYNAMIC_TYPE_SIGNATURE); DYNAMIC_TYPE_SIGNATURE);
if (peerCert->sig == NULL) { if (peerCert->sig == NULL) {
FreeDecodedCert(cert); FreeDecodedCert(cert);
@@ -37669,7 +37669,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
{ {
int ret; int ret;
/* @TODO dynamic set based on expected cert size */ /* @TODO dynamic set based on expected cert size */
byte *der = XMALLOC(WC_MAX_X509_GEN, NULL, DYNAMIC_TYPE_TMP_BUFFER); byte *der = (byte *)XMALLOC(WC_MAX_X509_GEN, NULL, DYNAMIC_TYPE_TMP_BUFFER);
int derSz = WC_MAX_X509_GEN; int derSz = WC_MAX_X509_GEN;
WOLFSSL_ENTER("wolfSSL_X509_sign"); WOLFSSL_ENTER("wolfSSL_X509_sign");

34
wolfcrypt/test/test.c
View File

@@ -4367,8 +4367,8 @@ static int hc128_test(void)
HC128 enc_buffer, *enc = &enc_buffer, HC128 enc_buffer, *enc = &enc_buffer,
dec_buffer, *dec = &dec_buffer; dec_buffer, *dec = &dec_buffer;
#else #else
HC128 *enc = XMALLOC(sizeof *enc, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); HC128 *enc = (HC128 *)XMALLOC(sizeof *enc, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
HC128 *dec = XMALLOC(sizeof *enc, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); HC128 *dec = (HC128 *)XMALLOC(sizeof *enc, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if ((! enc) || (! dec)) { if ((! enc) || (! dec)) {
ERROR_OUT(-4322, out); ERROR_OUT(-4322, out);
} }
@@ -11074,7 +11074,7 @@ static int decodedCertCache_test(void)
word32 derSz; word32 derSz;
derSz = FOURK_BUF; derSz = FOURK_BUF;
der = XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); der = (byte *)XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (der == NULL) if (der == NULL)
ret = -7400; ret = -7400;
@@ -21685,7 +21685,7 @@ static int ed25519_test_cert(void)
size_t bytes; size_t bytes;
XFILE file; XFILE file;
tmp = XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); tmp = (byte *)XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (tmp == NULL) { if (tmp == NULL) {
ERROR_OUT(-10323, done); ERROR_OUT(-10323, done);
} }
@@ -21811,7 +21811,7 @@ static int ed25519_test_make_cert(void)
ERROR_OUT(-10336, done); ERROR_OUT(-10336, done);
} }
#endif #endif
tmp = XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); tmp = (byte *)XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (tmp == NULL) { if (tmp == NULL) {
ERROR_OUT(-10337, done); ERROR_OUT(-10337, done);
} }
@@ -22969,7 +22969,7 @@ static int ed448_test_cert(void)
size_t bytes; size_t bytes;
XFILE file; XFILE file;
tmp = XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); tmp = (byte *)XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (tmp == NULL) { if (tmp == NULL) {
ERROR_OUT(-11023, done); ERROR_OUT(-11023, done);
} }
@@ -23094,7 +23094,7 @@ static int ed448_test_make_cert(void)
ERROR_OUT(-11036, done); ERROR_OUT(-11036, done);
} }
#endif #endif
tmp = XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); tmp = (byte *)XMALLOC(FOURK_BUF, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (tmp == NULL) { if (tmp == NULL) {
ERROR_OUT(-11037, done); ERROR_OUT(-11037, done);
} }
@@ -24466,8 +24466,8 @@ static int compress_test(void)
byte *c; byte *c;
byte *d; byte *d;
c = XMALLOC(cSz * sizeof(byte), HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); c = (byte *)XMALLOC(cSz * sizeof(byte), HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
d = XMALLOC(dSz * sizeof(byte), HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); d = (byte *)XMALLOC(dSz * sizeof(byte), HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (c == NULL || d == NULL) { if (c == NULL || d == NULL) {
ERROR_OUT(-11700, exit); ERROR_OUT(-11700, exit);
} }
@@ -25234,8 +25234,8 @@ static int pkcs7enveloped_run_vectors(byte* rsaCert, word32 rsaCertSz,
#endif #endif
}; };
enveloped = XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); enveloped = (byte *)XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
decoded = XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); decoded = (byte *)XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if ((! enveloped) || (! decoded)) { if ((! enveloped) || (! decoded)) {
ERROR_OUT(-11761, out); ERROR_OUT(-11761, out);
} }
@@ -25866,8 +25866,8 @@ static int pkcs7authenveloped_run_vectors(byte* rsaCert, word32 rsaCertSz,
#endif #endif
}; };
enveloped = XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); enveloped = (byte *)XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
decoded = XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); decoded = (byte *)XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if ((! enveloped) || (! decoded)) { if ((! enveloped) || (! decoded)) {
ERROR_OUT(-11804, out); ERROR_OUT(-11804, out);
} }
@@ -26810,8 +26810,8 @@ static int pkcs7encrypted_test(void)
#endif /* NO_AES */ #endif /* NO_AES */
}; };
encrypted = XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); encrypted = (byte *)XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
decoded = XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); decoded = (byte *)XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if ((! encrypted) || (! decoded)) { if ((! encrypted) || (! decoded)) {
ERROR_OUT(MEMORY_E, out); ERROR_OUT(MEMORY_E, out);
} }
@@ -26969,8 +26969,8 @@ static int pkcs7compressed_test(void)
"pkcs7compressedData_firmwarePkgData_zlib.der"}, "pkcs7compressedData_firmwarePkgData_zlib.der"},
}; };
enveloped = XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); enveloped = (byte *)XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
decoded = XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); decoded = (byte *)XMALLOC(PKCS7_BUF_SIZE, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if ((! enveloped) || (! decoded)) { if ((! enveloped) || (! decoded)) {
ERROR_OUT(MEMORY_E, out); ERROR_OUT(MEMORY_E, out);
} }