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

max fragment length tests and fixes

Browse Source
This commit is contained in:
Moisés Guimarães
2013-06-19 16:38:57 -03:00
parent 5f3ee80407
commit 25e910a0a9
3 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ssl.c
View File

@ -567,13 +567,13 @@ word16 CyaSSL_SNI_GetRequest(CYASSL* ssl, byte type, void** data)
#endif /* HAVE_SNI */ #endif /* HAVE_SNI */
#ifdef MAX_FRAGMENT_LENGTH #ifdef HAVE_MAX_FRAGMENT
int CyaSSL_UseMaxFragment(CYASSL* ssl, byte mfl) int CyaSSL_UseMaxFragment(CYASSL* ssl, byte mfl)
{ {
if (ssl == NULL) if (ssl == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return TLSX_UseMaxFragment(ssl->extensions, mfl); return TLSX_UseMaxFragment(&ssl->extensions, mfl);
} }
int CyaSSL_CTX_UseMaxFragment(CYASSL_CTX* ctx, byte mfl) int CyaSSL_CTX_UseMaxFragment(CYASSL_CTX* ctx, byte mfl)
@ -581,7 +581,7 @@ int CyaSSL_CTX_UseMaxFragment(CYASSL_CTX* ctx, byte mfl)
if (ctx == NULL) if (ctx == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
return TLSX_UseMaxFragment(ctx->extensions, mfl); return TLSX_UseMaxFragment(&ctx->extensions, mfl);
} }
#endif /* HAVE_MAX_FRAGMENT */ #endif /* HAVE_MAX_FRAGMENT */

12
src/tls.c
View File

@ -905,14 +905,14 @@ int TLSX_UseMaxFragment(TLSX** extensions, byte mfl)
if (extensions == NULL) if (extensions == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if (CYASSL_MFL_2_9 <= mfl && mfl <= CYASSL_MFL_2_12) { if (mfl < CYASSL_MFL_2_9 || CYASSL_MFL_2_13 < mfl)
if ((data = XMALLOC(ENUM_LEN, 0, DYNAMIC_TYPE_TLSX)) == NULL)
return MEMORY_E;
data[0] = mfl;
} else
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if ((data = XMALLOC(ENUM_LEN, 0, DYNAMIC_TYPE_TLSX)) == NULL)
return MEMORY_E;
data[0] = mfl;
/* push new MFL extension. */ /* push new MFL extension. */
if ((ret = TLSX_Append(extensions, MAX_FRAGMENT_LENGTH)) != 0) { if ((ret = TLSX_Append(extensions, MAX_FRAGMENT_LENGTH)) != 0) {
XFREE(data, 0, DYNAMIC_TYPE_TLSX); XFREE(data, 0, DYNAMIC_TYPE_TLSX);

44
tests/api.c
View File

@ -50,8 +50,11 @@ static int test_CyaSSL_read_write(void);
#ifdef HAVE_TLS_EXTENSIONS #ifdef HAVE_TLS_EXTENSIONS
#ifdef HAVE_SNI #ifdef HAVE_SNI
static void test_CyaSSL_UseSNI(void); static void test_CyaSSL_UseSNI(void);
#endif /* HAVE_TLS_EXTENSIONS */
#endif /* HAVE_SNI */ #endif /* HAVE_SNI */
#ifdef HAVE_MAX_FRAGMENT
static void test_CyaSSL_UseMaxFragment(void);
#endif /* HAVE_MAX_FRAGMENT */
#endif /* HAVE_TLS_EXTENSIONS */
/* test function helpers */ /* test function helpers */
static int test_method(CYASSL_METHOD *method, const char *name); static int test_method(CYASSL_METHOD *method, const char *name);
@ -107,6 +110,9 @@ int ApiTest(void)
#ifdef HAVE_SNI #ifdef HAVE_SNI
test_CyaSSL_UseSNI(); test_CyaSSL_UseSNI();
#endif /* HAVE_SNI */ #endif /* HAVE_SNI */
#ifdef HAVE_MAX_FRAGMENT
test_CyaSSL_UseMaxFragment();
#endif /* HAVE_MAX_FRAGMENT */
#endif /* HAVE_TLS_EXTENSIONS */ #endif /* HAVE_TLS_EXTENSIONS */
test_CyaSSL_Cleanup(); test_CyaSSL_Cleanup();
printf(" End API Tests\n"); printf(" End API Tests\n");
@ -382,9 +388,43 @@ void test_CyaSSL_UseSNI(void)
server_callbacks.on_result = verify_SNI_fake_matching; server_callbacks.on_result = verify_SNI_fake_matching;
test_CyaSSL_client_server(&client_callbacks, &server_callbacks); test_CyaSSL_client_server(&client_callbacks, &server_callbacks);
} }
#endif /* HAVE_SNI */ #endif /* HAVE_SNI */
#ifdef HAVE_MAX_FRAGMENT
static void test_CyaSSL_UseMaxFragment(void)
{
CYASSL_CTX *ctx = CyaSSL_CTX_new(CyaSSLv23_client_method());
CYASSL *ssl = CyaSSL_new(ctx);
AssertNotNull(ctx);
AssertNotNull(ssl);
/* error cases */
AssertIntNE(0, CyaSSL_CTX_UseMaxFragment(NULL, CYASSL_MFL_2_9));
AssertIntNE(0, CyaSSL_UseMaxFragment( NULL, CYASSL_MFL_2_9));
AssertIntNE(0, CyaSSL_CTX_UseMaxFragment(ctx, 0));
AssertIntNE(0, CyaSSL_CTX_UseMaxFragment(ctx, 6));
AssertIntNE(0, CyaSSL_UseMaxFragment(ssl, 0));
AssertIntNE(0, CyaSSL_UseMaxFragment(ssl, 6));
/* success case */
AssertIntEQ(0, CyaSSL_CTX_UseMaxFragment(ctx, CYASSL_MFL_2_9));
AssertIntEQ(0, CyaSSL_CTX_UseMaxFragment(ctx, CYASSL_MFL_2_10));
AssertIntEQ(0, CyaSSL_CTX_UseMaxFragment(ctx, CYASSL_MFL_2_11));
AssertIntEQ(0, CyaSSL_CTX_UseMaxFragment(ctx, CYASSL_MFL_2_12));
AssertIntEQ(0, CyaSSL_CTX_UseMaxFragment(ctx, CYASSL_MFL_2_13));
AssertIntEQ(0, CyaSSL_UseMaxFragment( ssl, CYASSL_MFL_2_9));
AssertIntEQ(0, CyaSSL_UseMaxFragment( ssl, CYASSL_MFL_2_10));
AssertIntEQ(0, CyaSSL_UseMaxFragment( ssl, CYASSL_MFL_2_11));
AssertIntEQ(0, CyaSSL_UseMaxFragment( ssl, CYASSL_MFL_2_12));
AssertIntEQ(0, CyaSSL_UseMaxFragment( ssl, CYASSL_MFL_2_13));
CyaSSL_free(ssl);
CyaSSL_CTX_free(ctx);
}
#endif /* HAVE_MAX_FRAGMENT */
#endif /* HAVE_TLS_EXTENSIONS */ #endif /* HAVE_TLS_EXTENSIONS */
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS)