feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

casting values, update names, g++ build

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-01-17 12:18:00 -07:00
parent 676e2f1f63
commit 19288ea127
3 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/ssl.c
View File

@@ -6794,7 +6794,7 @@ void wolfSSL_CTX_set_verify_depth(WOLFSSL_CTX *ctx, int depth) {
return; return;
} }
ctx->verifyDepth = depth; ctx->verifyDepth = (byte)depth;
} }
@@ -14367,7 +14367,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
if (enc){ if (enc){
wc_Des_CbcEncrypt(&myDes, output, input, (word32)blk*DES_BLOCK_SIZE); wc_Des_CbcEncrypt(&myDes, output, input, (word32)blk*DES_BLOCK_SIZE);
if(lb_sz){ if(lb_sz){
XMEMSET(lastblock, DES_BLOCK_SIZE, 0); XMEMSET(lastblock, 0, DES_BLOCK_SIZE);
XMEMCPY(lastblock, input+length-lb_sz, lb_sz); XMEMCPY(lastblock, input+length-lb_sz, lb_sz);
wc_Des_CbcEncrypt(&myDes, output+blk*DES_BLOCK_SIZE, wc_Des_CbcEncrypt(&myDes, output+blk*DES_BLOCK_SIZE,
lastblock, (word32)DES_BLOCK_SIZE); lastblock, (word32)DES_BLOCK_SIZE);
@@ -14409,7 +14409,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
wc_Des3_SetKey(&des, key, (const byte*)ivec, DES_ENCRYPTION); wc_Des3_SetKey(&des, key, (const byte*)ivec, DES_ENCRYPTION);
wc_Des3_CbcEncrypt(&des, output, input, (word32)blk*DES_BLOCK_SIZE); wc_Des3_CbcEncrypt(&des, output, input, (word32)blk*DES_BLOCK_SIZE);
if(lb_sz){ if(lb_sz){
XMEMSET(lastblock, DES_BLOCK_SIZE, 0); XMEMSET(lastblock, 0, DES_BLOCK_SIZE);
XMEMCPY(lastblock, input+sz-lb_sz, lb_sz); XMEMCPY(lastblock, input+sz-lb_sz, lb_sz);
wc_Des3_CbcEncrypt(&des, output+blk*DES_BLOCK_SIZE, wc_Des3_CbcEncrypt(&des, output+blk*DES_BLOCK_SIZE,
lastblock, (word32)DES_BLOCK_SIZE); lastblock, (word32)DES_BLOCK_SIZE);
@@ -14446,7 +14446,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
if (enc){ if (enc){
wc_Des_CbcEncrypt(&myDes, output, input, (word32)blk*DES_BLOCK_SIZE); wc_Des_CbcEncrypt(&myDes, output, input, (word32)blk*DES_BLOCK_SIZE);
if(lb_sz){ if(lb_sz){
XMEMSET(lastblock, DES_BLOCK_SIZE, 0); XMEMSET(lastblock, 0, DES_BLOCK_SIZE);
XMEMCPY(lastblock, input+length-lb_sz, lb_sz); XMEMCPY(lastblock, input+length-lb_sz, lb_sz);
wc_Des_CbcEncrypt(&myDes, output+blk*DES_BLOCK_SIZE, wc_Des_CbcEncrypt(&myDes, output+blk*DES_BLOCK_SIZE,
lastblock, (word32)DES_BLOCK_SIZE); lastblock, (word32)DES_BLOCK_SIZE);
@@ -14614,7 +14614,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return SSL_FAILURE; return SSL_FAILURE;
} }
XMEMCPY(ctx->sessionCtx, sid_ctx, sid_ctx_len); XMEMCPY(ctx->sessionCtx, sid_ctx, sid_ctx_len);
ctx->sessionCtxSz = sid_ctx_len; ctx->sessionCtxSz = (byte)sid_ctx_len;
return SSL_SUCCESS; return SSL_SUCCESS;
} }
@@ -14639,7 +14639,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
return SSL_FAILURE; return SSL_FAILURE;
} }
XMEMCPY(ssl->sessionCtx, id, len); XMEMCPY(ssl->sessionCtx, id, len);
ssl->sessionCtxSz = len; ssl->sessionCtxSz = (byte)len;
return SSL_SUCCESS; return SSL_SUCCESS;
} }
@@ -24684,64 +24684,64 @@ int wolfSSL_HMAC_CTX_copy(WOLFSSL_HMAC_CTX* des, WOLFSSL_HMAC_CTX* src)
/* requires that hash structures have no dynamic parts to them */ /* requires that hash structures have no dynamic parts to them */
switch (src->hmac.macType) { switch (src->hmac.macType) {
#ifndef NO_MD5 #ifndef NO_MD5
case MD5: case WC_MD5:
XMEMCPY(&des->hmac.hash.md5, &src->hmac.hash.md5, sizeof(Md5)); XMEMCPY(&des->hmac.hash.md5, &src->hmac.hash.md5, sizeof(wc_Md5));
break; break;
#endif /* !NO_MD5 */ #endif /* !NO_MD5 */
#ifndef NO_SHA #ifndef NO_SHA
case SHA: case WC_SHA:
XMEMCPY(&des->hmac.hash.sha, &src->hmac.hash.sha, sizeof(Sha)); XMEMCPY(&des->hmac.hash.sha, &src->hmac.hash.sha, sizeof(wc_Sha));
break; break;
#endif /* !NO_SHA */ #endif /* !NO_SHA */
#ifdef WOLFSSL_SHA224 #ifdef WOLFSSL_SHA224
case SHA224: case WC_SHA224:
XMEMCPY(&des->hmac.hash.sha224, &src->hmac.hash.sha224, XMEMCPY(&des->hmac.hash.sha224, &src->hmac.hash.sha224,
sizeof(Sha224)); sizeof(wc_Sha224));
break; break;
#endif /* WOLFSSL_SHA224 */ #endif /* WOLFSSL_SHA224 */
#ifndef NO_SHA256 #ifndef NO_SHA256
case SHA256: case WC_SHA256:
XMEMCPY(&des->hmac.hash.sha256, &src->hmac.hash.sha256, XMEMCPY(&des->hmac.hash.sha256, &src->hmac.hash.sha256,
sizeof(Sha256)); sizeof(wc_Sha256));
break; break;
#endif /* !NO_SHA256 */ #endif /* !NO_SHA256 */
#ifdef WOLFSSL_SHA512 #ifdef WOLFSSL_SHA512
#ifdef WOLFSSL_SHA384 #ifdef WOLFSSL_SHA384
case SHA384: case WC_SHA384:
XMEMCPY(&des->hmac.hash.sha384, &src->hmac.hash.sha384, XMEMCPY(&des->hmac.hash.sha384, &src->hmac.hash.sha384,
sizeof(Sha384)); sizeof(wc_Sha384));
break; break;
#endif /* WOLFSSL_SHA384 */ #endif /* WOLFSSL_SHA384 */
case SHA512: case WC_SHA512:
XMEMCPY(&des->hmac.hash.sha512, &src->hmac.hash.sha512, XMEMCPY(&des->hmac.hash.sha512, &src->hmac.hash.sha512,
sizeof(Sha512)); sizeof(wc_Sha512));
break; break;
#endif /* WOLFSSL_SHA512 */ #endif /* WOLFSSL_SHA512 */
default: default:
WOLFSSL_MSG("Unknown or unsupported hash type"); WOLFSSL_MSG("Unknown or unsupported hash type");
return SSL_FAILURE; return WOLFSSL_FAILURE;
} }
XMEMCPY((byte*)des->hmac.ipad, (byte*)src->hmac.ipad, HMAC_BLOCK_SIZE); XMEMCPY((byte*)des->hmac.ipad, (byte*)src->hmac.ipad, WC_HMAC_BLOCK_SIZE);
XMEMCPY((byte*)des->hmac.opad, (byte*)src->hmac.opad, HMAC_BLOCK_SIZE); XMEMCPY((byte*)des->hmac.opad, (byte*)src->hmac.opad, WC_HMAC_BLOCK_SIZE);
XMEMCPY((byte*)des->hmac.innerHash, (byte*)src->hmac.innerHash, XMEMCPY((byte*)des->hmac.innerHash, (byte*)src->hmac.innerHash,
MAX_DIGEST_SIZE); WC_MAX_DIGEST_SIZE);
des->hmac.heap = src->hmac.heap; des->hmac.heap = src->hmac.heap;
des->hmac.macType = src->hmac.macType; des->hmac.macType = src->hmac.macType;
des->hmac.innerHashKeyed = src->hmac.innerHashKeyed; des->hmac.innerHashKeyed = src->hmac.innerHashKeyed;
XMEMCPY((byte *)&des->save_ipad, (byte *)&src->hmac.ipad, XMEMCPY((byte *)&des->save_ipad, (byte *)&src->hmac.ipad,
HMAC_BLOCK_SIZE); WC_HMAC_BLOCK_SIZE);
XMEMCPY((byte *)&des->save_opad, (byte *)&src->hmac.opad, XMEMCPY((byte *)&des->save_opad, (byte *)&src->hmac.opad,
HMAC_BLOCK_SIZE); WC_HMAC_BLOCK_SIZE);
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
XMEMCPY(des->hmac.asyncDev, src->hmac.asyncDev, sizeof(WC_ASYNC_DEV)); XMEMCPY(des->hmac.asyncDev, src->hmac.asyncDev, sizeof(WC_ASYNC_DEV));
XMEMCPY(des->hmac.keyRaw, src->hmac.keyRaw, HMAC_BLOCK_SIZE); XMEMCPY(des->hmac.keyRaw, src->hmac.keyRaw, WC_HMAC_BLOCK_SIZE);
des->hmac.keyLen = src->hmac.keyLen; des->hmac.keyLen = src->hmac.keyLen;
#ifdef HAVE_CAVIUM #ifdef HAVE_CAVIUM
des->hmac.data = (byte*)XMALLOC(src->hmac.dataLen, des->heap, des->hmac.data = (byte*)XMALLOC(src->hmac.dataLen, des->heap,
@@ -24753,7 +24753,7 @@ int wolfSSL_HMAC_CTX_copy(WOLFSSL_HMAC_CTX* des, WOLFSSL_HMAC_CTX* src)
des->hmac.dataLen = src->hmac.dataLen; des->hmac.dataLen = src->hmac.dataLen;
#endif /* HAVE_CAVIUM */ #endif /* HAVE_CAVIUM */
#endif /* WOLFSSL_ASYNC_CRYPT */ #endif /* WOLFSSL_ASYNC_CRYPT */
return SSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
int wolfSSL_HMAC_Init(WOLFSSL_HMAC_CTX* ctx, const void* key, int keylen, int wolfSSL_HMAC_Init(WOLFSSL_HMAC_CTX* ctx, const void* key, int keylen,
@@ -24813,20 +24813,20 @@ int wolfSSL_HMAC_Init(WOLFSSL_HMAC_CTX* ctx, const void* key, int keylen,
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
XMEMCPY((byte *)&ctx->save_ipad, (byte *)&ctx->hmac.ipad, XMEMCPY((byte *)&ctx->save_ipad, (byte *)&ctx->hmac.ipad,
HMAC_BLOCK_SIZE); WC_HMAC_BLOCK_SIZE);
XMEMCPY((byte *)&ctx->save_opad, (byte *)&ctx->hmac.opad, XMEMCPY((byte *)&ctx->save_opad, (byte *)&ctx->hmac.opad,
HMAC_BLOCK_SIZE); WC_HMAC_BLOCK_SIZE);
} }
/* OpenSSL compat, no error */ /* OpenSSL compat, no error */
} else if(ctx->type >= 0) { /* MD5 == 0 */ } else if(ctx->type >= 0) { /* MD5 == 0 */
WOLFSSL_MSG("recover hmac"); WOLFSSL_MSG("recover hmac");
if (wc_HmacInit(&ctx->hmac, NULL, INVALID_DEVID) == 0) { if (wc_HmacInit(&ctx->hmac, NULL, INVALID_DEVID) == 0) {
ctx->hmac.macType = ctx->type; ctx->hmac.macType = (byte)ctx->type;
ctx->hmac.innerHashKeyed = 0; ctx->hmac.innerHashKeyed = 0;
XMEMCPY((byte *)&ctx->hmac.ipad, (byte *)&ctx->save_ipad, XMEMCPY((byte *)&ctx->hmac.ipad, (byte *)&ctx->save_ipad,
HMAC_BLOCK_SIZE); WC_HMAC_BLOCK_SIZE);
XMEMCPY((byte *)&ctx->hmac.opad, (byte *)&ctx->save_opad, XMEMCPY((byte *)&ctx->hmac.opad, (byte *)&ctx->save_opad,
HMAC_BLOCK_SIZE); WC_HMAC_BLOCK_SIZE);
if ((hmac_error = _InitHmac(&ctx->hmac, ctx->hmac.macType, ctx->hmac.heap)) if ((hmac_error = _InitHmac(&ctx->hmac, ctx->hmac.macType, ctx->hmac.heap))
!=0) { !=0) {
return hmac_error; return hmac_error;
@@ -28463,7 +28463,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
*out += sz; *out += sz;
} }
else { else {
*out = XMALLOC(sz, NULL, DYNAMIC_TYPE_OPENSSL); *out = (unsigned char*)XMALLOC(sz, NULL, DYNAMIC_TYPE_OPENSSL);
if (*out == NULL) { if (*out == NULL) {
return MEMORY_E; return MEMORY_E;
} }
@@ -29206,10 +29206,11 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
* *
* Returns a pointer to the message digest on success and NULL on failure. * Returns a pointer to the message digest on success and NULL on failure.
*/ */
unsigned char *wolfSSL_SHA1(const unsigned char *d, size_t n, unsigned char *md) unsigned char *wolfSSL_SHA1(const unsigned char *d, size_t n,
unsigned char *md)
{ {
static byte dig[SHA_DIGEST_SIZE]; static byte dig[WC_SHA_DIGEST_SIZE];
Sha sha; wc_Sha sha;
WOLFSSL_ENTER("wolfSSL_SHA1"); WOLFSSL_ENTER("wolfSSL_SHA1");
@@ -29231,7 +29232,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
wc_ShaFree(&sha); wc_ShaFree(&sha);
if (md != NULL) { if (md != NULL) {
XMEMCPY(md, dig, SHA_DIGEST_SIZE); XMEMCPY(md, dig, WC_SHA_DIGEST_SIZE);
return md; return md;
} }
else { else {

13
tests/api.c
View File

@@ -12766,7 +12766,7 @@ static int test_wc_ecc_encryptDecrypt (void)
WC_RNG rng; WC_RNG rng;
const char* msg = "EccBlock Size 16"; const char* msg = "EccBlock Size 16";
word32 msgSz = (word32)XSTRLEN(msg); word32 msgSz = (word32)XSTRLEN(msg);
byte out[XSTRLEN(msg) + SHA256_DIGEST_SIZE]; byte out[XSTRLEN(msg) + WC_SHA256_DIGEST_SIZE];
word32 outSz = (word32)sizeof(out); word32 outSz = (word32)sizeof(out);
byte plain[XSTRLEN(msg)]; byte plain[XSTRLEN(msg)];
word32 plainSz = (word32)sizeof(plain); word32 plainSz = (word32)sizeof(plain);
@@ -15903,7 +15903,8 @@ static void test_wolfSSL_sk_GENERAL_NAME(void)
AssertNotNull(x509 = d2i_X509(NULL, &bufPt, bytes)); AssertNotNull(x509 = d2i_X509(NULL, &bufPt, bytes));
/* current cert has no alt names */ /* current cert has no alt names */
AssertNull(sk = X509_get_ext_d2i(x509, NID_subject_alt_name, NULL, NULL)); AssertNull(sk = (WOLF_STACK_OF(ASN1_OBJECT)*)X509_get_ext_d2i(x509,
NID_subject_alt_name, NULL, NULL));
AssertIntEQ(sk_GENERAL_NAME_num(sk), -1); AssertIntEQ(sk_GENERAL_NAME_num(sk), -1);
#if 0 #if 0
@@ -16254,11 +16255,11 @@ static void test_wolfSSL_SHA(void)
const unsigned char in[] = "abc"; const unsigned char in[] = "abc";
unsigned char expected[] = "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E" unsigned char expected[] = "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E"
"\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D"; "\x25\x71\x78\x50\xC2\x6C\x9C\xD0\xD8\x9D";
unsigned char out[SHA_DIGEST_SIZE]; unsigned char out[WC_SHA_DIGEST_SIZE];
XMEMSET(out, 0, SHA_DIGEST_SIZE); XMEMSET(out, 0, WC_SHA_DIGEST_SIZE);
AssertNotNull(SHA1(in, XSTRLEN((char*)in), out)); AssertNotNull(SHA1(in, XSTRLEN((char*)in), out));
AssertIntEQ(XMEMCMP(out, expected, SHA_DIGEST_SIZE), 0); AssertIntEQ(XMEMCMP(out, expected, WC_SHA_DIGEST_SIZE), 0);
} }
#endif #endif
printf(resultFmt, passed); printf(resultFmt, passed);
@@ -16271,7 +16272,7 @@ static void test_wolfSSL_DH_1536_prime(void)
BIGNUM* bn; BIGNUM* bn;
unsigned char bits[200]; unsigned char bits[200];
int sz = 192; /* known binary size */ int sz = 192; /* known binary size */
const char expected[] = { const byte expected[] = {
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xC9,0x0F,0xDA,0xA2,0x21,0x68,0xC2,0x34, 0xC9,0x0F,0xDA,0xA2,0x21,0x68,0xC2,0x34,
0xC4,0xC6,0x62,0x8B,0x80,0xDC,0x1C,0xD1, 0xC4,0xC6,0x62,0x8B,0x80,0xDC,0x1C,0xD1,

4
wolfssl/internal.h
View File

@@ -2268,7 +2268,7 @@ struct WOLFSSL_CTX {
#endif #endif
Suites* suites; /* make dynamic, user may not need/set */ Suites* suites; /* make dynamic, user may not need/set */
void* heap; /* for user memory overrides */ void* heap; /* for user memory overrides */
int verifyDepth; byte verifyDepth;
byte verifyPeer; byte verifyPeer;
byte verifyNone; byte verifyNone;
byte failNoCert; byte failNoCert;
@@ -3320,7 +3320,6 @@ struct WOLFSSL {
WOLFSSL_SESSION* extSession; WOLFSSL_SESSION* extSession;
#endif #endif
WOLFSSL_ALERT_HISTORY alert_history; WOLFSSL_ALERT_HISTORY alert_history;
int verifyDepth;
int error; int error;
int rfd; /* read file descriptor */ int rfd; /* read file descriptor */
int wfd; /* write file descriptor */ int wfd; /* write file descriptor */
@@ -3329,6 +3328,7 @@ struct WOLFSSL {
word32 timeout; /* session timeout */ word32 timeout; /* session timeout */
word32 fragOffset; /* fragment offset */ word32 fragOffset; /* fragment offset */
word16 curSize; word16 curSize;
byte verifyDepth;
RecordLayerHeader curRL; RecordLayerHeader curRL;
MsgsReceived msgsReceived; /* peer messages received */ MsgsReceived msgsReceived; /* peer messages received */
ProtocolVersion version; /* negotiated version */ ProtocolVersion version; /* negotiated version */