wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix cast and initialization of variable

Browse Source
This commit is contained in:
Jacob Barthelmeh
2019-08-19 14:54:53 -06:00
parent 487e66394e
commit 01a3b59e28
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tests/api.c
View File

@ -16029,7 +16029,7 @@ static void test_wc_PKCS7_InitWithCert (void)
fp = XFOPEN("./certs/1024/client-cert.der", "rb"); fp = XFOPEN("./certs/1024/client-cert.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp); certSz = (int)XFREAD(cert, 1, sizeof_client_cert_der_1024, fp);
XFCLOSE(fp); XFCLOSE(fp);
#endif #endif
#elif defined(HAVE_ECC) #elif defined(HAVE_ECC)
@ -16046,7 +16046,7 @@ static void test_wc_PKCS7_InitWithCert (void)
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
certSz = XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp); certSz = (int)XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp);
XFCLOSE(fp); XFCLOSE(fp);
#endif #endif
#else #else
@ -16116,12 +16116,12 @@ static void test_wc_PKCS7_EncodeData (void)
fp = XFOPEN("./certs/1024/client-cert.der", "rb"); fp = XFOPEN("./certs/1024/client-cert.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp); certSz = (int)XFREAD(cert, 1, sizeof_client_cert_der_1024, fp);
XFCLOSE(fp); XFCLOSE(fp);
fp = XFOPEN("./certs/1024/client-key.der", "rb"); fp = XFOPEN("./certs/1024/client-key.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
keySz = XFREAD(key, 1, sizeof_client_key_der_1024, fp); keySz = (int)XFREAD(key, 1, sizeof_client_key_der_1024, fp);
XFCLOSE(fp); XFCLOSE(fp);
#endif #endif
#elif defined(HAVE_ECC) #elif defined(HAVE_ECC)
@ -16142,12 +16142,12 @@ static void test_wc_PKCS7_EncodeData (void)
fp = XFOPEN("./certs/client-ecc-cert.der", "rb"); fp = XFOPEN("./certs/client-ecc-cert.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
certSz = XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp); certSz = (int)XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp);
XFCLOSE(fp); XFCLOSE(fp);
fp = XFOPEN("./certs/client-ecc-key.der", "rb"); fp = XFOPEN("./certs/client-ecc-key.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
keySz = XFREAD(key, 1, sizeof_ecc_clikey_der_256, fp); keySz = (int)XFREAD(key, 1, sizeof_ecc_clikey_der_256, fp);
XFCLOSE(fp); XFCLOSE(fp);
#endif #endif
#endif #endif
@ -16223,12 +16223,12 @@ static void test_wc_PKCS7_EncodeSignedData(void)
fp = XFOPEN("./certs/1024/client-cert.der", "rb"); fp = XFOPEN("./certs/1024/client-cert.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp); certSz = (int)XFREAD(cert, 1, sizeof_client_cert_der_1024, fp);
XFCLOSE(fp); XFCLOSE(fp);
fp = XFOPEN("./certs/1024/client-key.der", "rb"); fp = XFOPEN("./certs/1024/client-key.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
keySz = XFREAD(key, 1, sizeof_client_key_der_1024, fp); keySz = (int)XFREAD(key, 1, sizeof_client_key_der_1024, fp);
XFCLOSE(fp); XFCLOSE(fp);
#endif #endif
#elif defined(HAVE_ECC) #elif defined(HAVE_ECC)
@ -16249,12 +16249,12 @@ static void test_wc_PKCS7_EncodeSignedData(void)
fp = XOPEN("./certs/client-ecc-cert.der", "rb"); fp = XOPEN("./certs/client-ecc-cert.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
certSz = XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp); certSz = (int)XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp);
XFCLOSE(fp); XFCLOSE(fp);
fp = XFOPEN("./certs/client-ecc-key.der", "rb"); fp = XFOPEN("./certs/client-ecc-key.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
keySz = XFREAD(key, 1, sizeof_ecc_clikey_der_256, fp); keySz = (int)XFREAD(key, 1, sizeof_ecc_clikey_der_256, fp);
XFCLOSE(fp); XFCLOSE(fp);
#endif #endif
#endif #endif
@ -16347,12 +16347,12 @@ static void test_wc_PKCS7_EncodeSignedData_ex(void)
fp = XFOPEN("./certs/1024/client-cert.der", "rb"); fp = XFOPEN("./certs/1024/client-cert.der", "rb");
AssertTrue((fp != XBADFILE)); AssertTrue((fp != XBADFILE));
certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp); certSz = (int)XFREAD(cert, 1, sizeof_client_cert_der_1024, fp);
XFCLOSE(fp); XFCLOSE(fp);
fp = XFOPEN("./certs/1024/client-key.der", "rb"); fp = XFOPEN("./certs/1024/client-key.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
keySz = XFREAD(key, 1, sizeof_client_key_der_1024, fp); keySz = (int)XFREAD(key, 1, sizeof_client_key_der_1024, fp);
XFCLOSE(fp); XFCLOSE(fp);
#endif #endif
#elif defined(HAVE_ECC) #elif defined(HAVE_ECC)
@ -16373,12 +16373,12 @@ static void test_wc_PKCS7_EncodeSignedData_ex(void)
fp = XFOPEN("./certs/client-ecc-cert.der", "rb"); fp = XFOPEN("./certs/client-ecc-cert.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
certSz = XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp); certSz = (int)XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp);
XFCLOSE(fp); XFCLOSE(fp);
fp = XFOPEN("./certs/client-ecc-key.der", "rb"); fp = XFOPEN("./certs/client-ecc-key.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
keySz = XFREAD(key, 1, sizeof_ecc_clikey_der_256, fp); keySz = (int)XFREAD(key, 1, sizeof_ecc_clikey_der_256, fp);
XFCLOSE(fp); XFCLOSE(fp);
#endif #endif
#endif #endif
@ -17721,7 +17721,7 @@ static void test_wc_i2d_PKCS12(void)
printf(testingFmt, "wc_i2d_PKCS12"); printf(testingFmt, "wc_i2d_PKCS12");
AssertNotNull(f = XFOPEN(p12_f, "rb")); AssertNotNull(f = XFOPEN(p12_f, "rb"));
derSz = XFREAD(der, 1, sizeof(der), f); derSz = (int)XFREAD(der, 1, sizeof(der), f);
AssertIntGT(derSz, 0); AssertIntGT(derSz, 0);
XFCLOSE(f); XFCLOSE(f);
@ -17852,7 +17852,7 @@ static int test_wc_SignatureGetSize_rsa(void)
#elif !defined(NO_FILESYSTEM) #elif !defined(NO_FILESYSTEM)
file = XFOPEN(clientKey, "rb"); file = XFOPEN(clientKey, "rb");
if (file != XBADFILE) { if (file != XBADFILE) {
bytes = XFREAD(tmp, 1, FOURK_BUF, file); bytes = (size_t)XFREAD(tmp, 1, FOURK_BUF, file);
XFCLOSE(file); XFCLOSE(file);
} }
else { else {
@ -18827,7 +18827,7 @@ static void test_wolfSSL_PEM_PrivateKey(void)
f = XFOPEN("./certs/ecc-key.der", "rb"); f = XFOPEN("./certs/ecc-key.der", "rb");
AssertTrue((f != XBADFILE)); AssertTrue((f != XBADFILE));
bytes = XFREAD(buf, 1, sizeof(buf), f); bytes = (size_t)XFREAD(buf, 1, sizeof(buf), f);
XFCLOSE(f); XFCLOSE(f);
server_key = buf; server_key = buf;
@ -24071,12 +24071,12 @@ static void test_wolfSSL_PEM_write_bio_PKCS7(void)
fp = XFOPEN("./certs/1024/client-cert.der", "rb"); fp = XFOPEN("./certs/1024/client-cert.der", "rb");
AssertTrue((fp != XBADFILE)); AssertTrue((fp != XBADFILE));
certSz = XFREAD(cert, 1, sizeof_client_cert_der_1024, fp); certSz = (int)XFREAD(cert, 1, sizeof_client_cert_der_1024, fp);
XFCLOSE(fp); XFCLOSE(fp);
fp = XFOPEN("./certs/1024/client-key.der", "rb"); fp = XFOPEN("./certs/1024/client-key.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
keySz = XFREAD(key, 1, sizeof_client_key_der_1024, fp); keySz = (int)XFREAD(key, 1, sizeof_client_key_der_1024, fp);
XFCLOSE(fp); XFCLOSE(fp);
#endif #endif
#elif defined(HAVE_ECC) #elif defined(HAVE_ECC)
@ -24097,12 +24097,12 @@ static void test_wolfSSL_PEM_write_bio_PKCS7(void)
fp = XFOPEN("./certs/client-ecc-cert.der", "rb"); fp = XFOPEN("./certs/client-ecc-cert.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
certSz = XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp); certSz = (int)XFREAD(cert, 1, sizeof_cliecc_cert_der_256, fp);
XFCLOSE(fp); XFCLOSE(fp);
fp = XFOPEN("./certs/client-ecc-key.der", "rb"); fp = XFOPEN("./certs/client-ecc-key.der", "rb");
AssertTrue(fp != XBADFILE); AssertTrue(fp != XBADFILE);
keySz = XFREAD(key, 1, sizeof_ecc_clikey_der_256, fp); keySz = (int)XFREAD(key, 1, sizeof_ecc_clikey_der_256, fp);
XFCLOSE(fp); XFCLOSE(fp);
#endif #endif
#else #else

2
wolfcrypt/src/pkcs12.c
View File

@ -682,7 +682,7 @@ int wc_d2i_PKCS12(const byte* der, word32 derSz, WC_PKCS12* pkcs12)
int wc_i2d_PKCS12(WC_PKCS12* pkcs12, byte** der, int* derSz) int wc_i2d_PKCS12(WC_PKCS12* pkcs12, byte** der, int* derSz)
{ {
int ret = 0; int ret = 0;
word32 seqSz, verSz = 0, totalSz = 0, idx = 0, sdBufSz = 0; word32 seqSz = 0, verSz = 0, totalSz = 0, idx = 0, sdBufSz = 0;
byte *buf = NULL; byte *buf = NULL;
byte ver[MAX_VERSION_SZ]; byte ver[MAX_VERSION_SZ];
byte seq[MAX_SEQ_SZ]; byte seq[MAX_SEQ_SZ];