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

changes WOLFSSL_SKIP_UNSUPPORTED_EXTENSION to WOLFSSL_OLD_UNSUPPORTED_EXTENSION

Browse Source
This commit is contained in:
Moisés Guimarães
2017-11-10 11:35:49 -02:00
parent b672616b38
commit d7abd5c8fb
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tls.c
View File

@ -980,13 +980,8 @@ int TLSX_HandleUnsupportedExtension(WOLFSSL* ssl);
int TLSX_HandleUnsupportedExtension(WOLFSSL* ssl) int TLSX_HandleUnsupportedExtension(WOLFSSL* ssl)
{ {
#ifdef WOLFSSL_SKIP_UNSUPPORTED_EXTENSION SendAlert(ssl, alert_fatal, unsupported_extension);
(void)ssl; return UNSUPPORTED_EXTENSION;
return 0;
#else
SendAlert(ssl, alert_fatal, unsupported_extension);
return UNSUPPORTED_EXTENSION;
#endif
} }
#else #else
@ -1196,7 +1191,7 @@ static int TLSX_ALPN_ParseAndSet(WOLFSSL *ssl, byte *input, word16 length,
ssl->alpnSelectArg) == 0) { ssl->alpnSelectArg) == 0) {
WOLFSSL_MSG("ALPN protocol match"); WOLFSSL_MSG("ALPN protocol match");
if (TLSX_UseALPN(&ssl->extensions, (char*)out, outLen, 0, ssl->heap) if (TLSX_UseALPN(&ssl->extensions, (char*)out, outLen, 0, ssl->heap)
== WOLFSSL_SUCCESS) { == WOLFSSL_SUCCESS) {
if (extension == NULL) { if (extension == NULL) {
extension = TLSX_Find(ssl->extensions, extension = TLSX_Find(ssl->extensions,
TLSX_APPLICATION_LAYER_PROTOCOL); TLSX_APPLICATION_LAYER_PROTOCOL);
@ -1977,9 +1972,13 @@ static int TLSX_MFL_Parse(WOLFSSL* ssl, byte* input, word16 length,
if (length != ENUM_LEN) if (length != ENUM_LEN)
return BUFFER_ERROR; return BUFFER_ERROR;
#ifdef WOLFSSL_OLD_UNSUPPORTED_EXTENSION
(void) isRequest;
#else
if (!isRequest) if (!isRequest)
if (TLSX_CheckUnsupportedExtension(ssl, TLSX_MAX_FRAGMENT_LENGTH)) if (TLSX_CheckUnsupportedExtension(ssl, TLSX_MAX_FRAGMENT_LENGTH))
return TLSX_HandleUnsupportedExtension(ssl); return TLSX_HandleUnsupportedExtension(ssl);
#endif
switch (*input) { switch (*input) {
case WOLFSSL_MFL_2_9 : ssl->max_fragment = 512; break; case WOLFSSL_MFL_2_9 : ssl->max_fragment = 512; break;
@ -2059,8 +2058,10 @@ static int TLSX_THM_Parse(WOLFSSL* ssl, byte* input, word16 length,
return BUFFER_ERROR; return BUFFER_ERROR;
if (!isRequest) { if (!isRequest) {
#ifndef WOLFSSL_OLD_UNSUPPORTED_EXTENSION
if (TLSX_CheckUnsupportedExtension(ssl, TLSX_TRUNCATED_HMAC)) if (TLSX_CheckUnsupportedExtension(ssl, TLSX_TRUNCATED_HMAC))
return TLSX_HandleUnsupportedExtension(ssl); return TLSX_HandleUnsupportedExtension(ssl);
#endif
} }
else { else {
#ifndef NO_WOLFSSL_SERVER #ifndef NO_WOLFSSL_SERVER