mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build errors when compiler is C++

Browse Source
This commit is contained in:
toddouska 2014-12-04 17:16:39 -08:00
parent 8105b9efa2
commit 51ffb84e11
10 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ctaocrypt/src/asn.c
View File

@ -6327,9 +6327,6 @@ static int SetNameFromCert(CertName* cn, const byte* der, int derSz)
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
/* forward from CyaSSL */
int CyaSSL_PemCertToDer(const char* fileName, unsigned char* derBuf, int derSz);
/* Set cert issuer from issuerFile in PEM */ /* Set cert issuer from issuerFile in PEM */
int SetIssuer(Cert* cert, const char* issuerFile) int SetIssuer(Cert* cert, const char* issuerFile)
{ {

4
ctaocrypt/src/ecc.c
View File

@ -1768,11 +1768,11 @@ static int ecc_mul2add(ecc_point* A, mp_int* kA,
/* allocate memory */ /* allocate memory */
tA = XMALLOC(ECC_BUFSIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER); tA = (unsigned char*)XMALLOC(ECC_BUFSIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (tA == NULL) { if (tA == NULL) {
return GEN_MEM_ERR; return GEN_MEM_ERR;
} }
tB = XMALLOC(ECC_BUFSIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER); tB = (unsigned char*)XMALLOC(ECC_BUFSIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (tB == NULL) { if (tB == NULL) {
XFREE(tA, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(tA, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return GEN_MEM_ERR; return GEN_MEM_ERR;

2
ctaocrypt/src/random.c
View File

@ -368,7 +368,7 @@ int InitRng(RNG* rng)
if (rng != NULL) { if (rng != NULL) {
byte entropy[ENTROPY_NONCE_SZ]; byte entropy[ENTROPY_NONCE_SZ];
rng->drbg = XMALLOC(sizeof(DRBG), NULL, DYNAMIC_TYPE_RNG); rng->drbg = (struct DRBG*)XMALLOC(sizeof(DRBG), NULL, DYNAMIC_TYPE_RNG);
if (rng->drbg == NULL) { if (rng->drbg == NULL) {
ret = MEMORY_E; ret = MEMORY_E;
} }

8
cyassl/ctaocrypt/asn.h
View File

@ -553,6 +553,14 @@ enum cert_enums {
ECC_KEY = 12 ECC_KEY = 12
}; };
#ifndef CYASSL_PEMCERT_TODER_DEFINED
#ifndef NO_FILESYSTEM
/* forward from CyaSSL */
CYASSL_API
int CyaSSL_PemCertToDer(const char* fileName, unsigned char* derBuf, int derSz);
#define CYASSL_PEMCERT_TODER_DEFINED
#endif
#endif
#endif /* CYASSL_CERT_GEN */ #endif /* CYASSL_CERT_GEN */

5
cyassl/ssl.h
View File

@ -227,7 +227,10 @@ CYASSL_API int CyaSSL_use_RSAPrivateKey_file(CYASSL*, const char*, int);
/* load NTRU private key blob */ /* load NTRU private key blob */
#endif #endif
CYASSL_API int CyaSSL_PemCertToDer(const char*, unsigned char*, int); #ifndef CYASSL_PEMCERT_TODER_DEFINED
CYASSL_API int CyaSSL_PemCertToDer(const char*, unsigned char*, int);
#define CYASSL_PEMCERT_TODER_DEFINED
#endif
#endif /* !NO_FILESYSTEM && !NO_CERTS */ #endif /* !NO_FILESYSTEM && !NO_CERTS */

4
cyassl/test.h
View File

@ -1572,8 +1572,8 @@ static INLINE void SetupAtomicUser(CYASSL_CTX* ctx, CYASSL* ssl)
static INLINE void FreeAtomicUser(CYASSL* ssl) static INLINE void FreeAtomicUser(CYASSL* ssl)
{ {
AtomicEncCtx* encCtx = CyaSSL_GetMacEncryptCtx(ssl); AtomicEncCtx* encCtx = (AtomicEncCtx*)CyaSSL_GetMacEncryptCtx(ssl);
AtomicDecCtx* decCtx = CyaSSL_GetDecryptVerifyCtx(ssl); AtomicDecCtx* decCtx = (AtomicDecCtx*)CyaSSL_GetDecryptVerifyCtx(ssl);
free(decCtx); free(decCtx);
free(encCtx); free(encCtx);

4
src/internal.c
View File

@ -4423,7 +4423,7 @@ static int DoCertificate(CYASSL* ssl, byte* input, word32* inOutIdx,
#ifdef HAVE_PK_CALLBACKS #ifdef HAVE_PK_CALLBACKS
#ifndef NO_RSA #ifndef NO_RSA
ssl->buffers.peerRsaKey.buffer = ssl->buffers.peerRsaKey.buffer =
XMALLOC(dCert->pubKeySize, (byte*)XMALLOC(dCert->pubKeySize,
ssl->heap, DYNAMIC_TYPE_RSA); ssl->heap, DYNAMIC_TYPE_RSA);
if (ssl->buffers.peerRsaKey.buffer == NULL) if (ssl->buffers.peerRsaKey.buffer == NULL)
ret = MEMORY_ERROR; ret = MEMORY_ERROR;
@ -4471,7 +4471,7 @@ static int DoCertificate(CYASSL* ssl, byte* input, word32* inOutIdx,
#ifdef HAVE_PK_CALLBACKS #ifdef HAVE_PK_CALLBACKS
#ifdef HAVE_ECC #ifdef HAVE_ECC
ssl->buffers.peerEccDsaKey.buffer = ssl->buffers.peerEccDsaKey.buffer =
XMALLOC(dCert->pubKeySize, (byte*)XMALLOC(dCert->pubKeySize,
ssl->heap, DYNAMIC_TYPE_ECC); ssl->heap, DYNAMIC_TYPE_ECC);
if (ssl->buffers.peerEccDsaKey.buffer == NULL) if (ssl->buffers.peerEccDsaKey.buffer == NULL)
ret = MEMORY_ERROR; ret = MEMORY_ERROR;

3
src/io.c
View File

@ -450,7 +450,8 @@ int EmbedSendTo(CYASSL* ssl, char *buf, int sz, void *ctx)
CYASSL_ENTER("EmbedSendTo()"); CYASSL_ENTER("EmbedSendTo()");
sent = (int)SENDTO_FUNCTION(sd, &buf[sz - len], len, ssl->wflags, sent = (int)SENDTO_FUNCTION(sd, &buf[sz - len], len, ssl->wflags,
dtlsCtx->peer.sa, dtlsCtx->peer.sz); (const struct sockaddr*)dtlsCtx->peer.sa,
dtlsCtx->peer.sz);
if (sent < 0) { if (sent < 0) {
err = LastError(); err = LastError();
CYASSL_MSG("Embed Send To error"); CYASSL_MSG("Embed Send To error");

4
src/sniffer.c
View File

@ -593,8 +593,8 @@ typedef struct TcpPseudoHdr {
static int SetPassword(char* passwd, int sz, int rw, void* userdata) static int SetPassword(char* passwd, int sz, int rw, void* userdata)
{ {
(void)rw; (void)rw;
XSTRNCPY(passwd, userdata, sz); XSTRNCPY(passwd, (const char*)userdata, sz);
return (int)XSTRLEN(userdata); return (int)XSTRLEN((const char*)userdata);
} }

4
src/ssl.c
View File

@ -7936,8 +7936,8 @@ int CyaSSL_set_compression(CYASSL* ssl)
if (HmacUpdate(hmac, d, n) == 0) if (HmacUpdate(hmac, d, n) == 0)
if (HmacFinal(hmac, md) == 0) { if (HmacFinal(hmac, md) == 0) {
if (md_len) if (md_len)
*md_len = type == MD5 ? MD5_DIGEST_SIZE *md_len = (type == MD5) ? (int)MD5_DIGEST_SIZE
: SHA_DIGEST_SIZE; : (int)SHA_DIGEST_SIZE;
ret = md; ret = md;
} }