From a3687a200a876f716d9f374682659d90f92ca2c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Guimar=C3=A3es?= Date: Fri, 13 Jun 2014 15:30:30 -0300 Subject: [PATCH 1/3] fix tests based on Wolfcrypt error codes. --- tests/api.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/api.c b/tests/api.c index 4b624adde..a78eb7d71 100644 --- a/tests/api.c +++ b/tests/api.c @@ -292,13 +292,13 @@ static void use_SNI_WITH_FAKE_ANSWER_at_ssl(CYASSL* ssl) static void verify_SNI_abort_on_client(CYASSL* ssl) { /* FATAL_ERROR */ - AssertIntEQ(-213, CyaSSL_get_error(ssl, 0)); + AssertIntEQ(-313, CyaSSL_get_error(ssl, 0)); } static void verify_SNI_abort_on_server(CYASSL* ssl) { /* UNKNOWN_SNI_HOST_NAME_E */ - AssertIntEQ(-281, CyaSSL_get_error(ssl, 0)); + AssertIntEQ(-381, CyaSSL_get_error(ssl, 0)); } static void verify_SNI_no_matching(CYASSL* ssl) @@ -417,19 +417,19 @@ static void test_CyaSSL_SNI_GetFromBuffer(void) AssertIntEQ(0, CyaSSL_SNI_GetFromBuffer(buffer2, sizeof(buffer2), 1, result, &length)); - AssertIntEQ(-228, CyaSSL_SNI_GetFromBuffer(buffer, sizeof(buffer), 0, + AssertIntEQ(-328, CyaSSL_SNI_GetFromBuffer(buffer, sizeof(buffer), 0, result, &length)); buffer[0] = 0x16; - AssertIntEQ(-228, CyaSSL_SNI_GetFromBuffer(buffer, sizeof(buffer), 0, + AssertIntEQ(-328, CyaSSL_SNI_GetFromBuffer(buffer, sizeof(buffer), 0, result, &length)); buffer[1] = 0x03; - AssertIntEQ(-228, CyaSSL_SNI_GetFromBuffer(buffer, sizeof(buffer), 0, + AssertIntEQ(-328, CyaSSL_SNI_GetFromBuffer(buffer, sizeof(buffer), 0, result, &length)); buffer[2] = 0x03; - AssertIntEQ(-210, CyaSSL_SNI_GetFromBuffer(buffer, sizeof(buffer), 0, + AssertIntEQ(-310, CyaSSL_SNI_GetFromBuffer(buffer, sizeof(buffer), 0, result, &length)); buffer[4] = 0x64; From 33fb6793346175be2133c5f5e165bd0d571445ba Mon Sep 17 00:00:00 2001 From: John Safranek Date: Sun, 15 Jun 2014 13:59:33 -0700 Subject: [PATCH 2/3] fix small config bug between AES-GCM and AES-CCM --- cyassl/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cyassl/internal.h b/cyassl/internal.h index 1d1e017a6..9b6c95a58 100644 --- a/cyassl/internal.h +++ b/cyassl/internal.h @@ -319,7 +319,7 @@ void c32to24(word32 in, word24 out); #ifdef HAVE_AESGCM #define BUILD_TLS_DHE_PSK_WITH_AES_128_GCM_SHA256 #endif - #ifdef HAVE_AESGCM + #ifdef HAVE_AESCCM #define BUILD_TLS_DHE_PSK_WITH_AES_128_CCM #define BUILD_TLS_DHE_PSK_WITH_AES_256_CCM #endif From acb3b1afb27805ec18b6cf12b0d60f583e913403 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Sun, 15 Jun 2014 17:26:18 -0700 Subject: [PATCH 3/3] fix bug with DTLS and IO Pools --- src/internal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/internal.c b/src/internal.c index d7740e0c1..5e8cc182b 100644 --- a/src/internal.c +++ b/src/internal.c @@ -2082,7 +2082,7 @@ int DtlsPoolSave(CYASSL* ssl, const byte *src, int sz) DtlsPool *pool = ssl->dtls_pool; if (pool != NULL && pool->used < DTLS_POOL_SZ) { buffer *pBuf = &pool->buf[pool->used]; - pBuf->buffer = (byte*)XMALLOC(sz, ssl->heap, DYNAMIC_TYPE_OUT_BUFFER); + pBuf->buffer = (byte*)XMALLOC(sz, ssl->heap, DYNAMIC_TYPE_DTLS_POOL); if (pBuf->buffer == NULL) { CYASSL_MSG("DTLS Buffer Memory error"); return MEMORY_ERROR; @@ -2104,7 +2104,7 @@ void DtlsPoolReset(CYASSL* ssl) used = pool->used; for (i = 0, pBuf = &pool->buf[0]; i < used; i++, pBuf++) { - XFREE(pBuf->buffer, ssl->heap, DYNAMIC_TYPE_OUT_BUFFER); + XFREE(pBuf->buffer, ssl->heap, DYNAMIC_TYPE_DTLS_POOL); pBuf->buffer = NULL; pBuf->length = 0; }