Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/tls.c
Original file line number Diff line number Diff line change
Expand Up @@ -2026,6 +2026,7 @@ static int TLSX_ALPN_ParseAndSet(WOLFSSL *ssl, const byte *input, word16 length,
word16 size = 0, offset = 0, wlen;
int r = WC_NO_ERR_TRACE(BUFFER_ERROR);
const byte *s;
word16 entryCount = 0;

if (OPAQUE16_LEN > length)
return BUFFER_ERROR;
Expand All @@ -2042,6 +2043,15 @@ static int TLSX_ALPN_ParseAndSet(WOLFSSL *ssl, const byte *input, word16 length,
wlen = *s++;
if (wlen == 0 || (s + wlen - input) > length)
return BUFFER_ERROR;
entryCount++;
}

/* RFC 7301 Section 3.1: the server's ProtocolNameList in its ALPN
* response MUST contain exactly one ProtocolName. */
if (!isRequest && entryCount != 1) {
SendAlert(ssl, alert_fatal, decode_error);
WOLFSSL_ERROR_VERBOSE(BUFFER_ERROR);
return BUFFER_ERROR;
}

if (isRequest) {
Expand Down
74 changes: 74 additions & 0 deletions tests/unit.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,71 @@
#include "wolfcrypt/test/test.h"
#endif

#if defined(HAVE_ALPN) && !defined(NO_WOLFSSL_CLIENT) && !defined(NO_TLS) && \
!defined(WOLFSSL_NO_TLS12)
#include <wolfssl/internal.h>

/* Regression test for missing RFC 7301 section 3.1 enforcement.
*
* the 'ProtocolNameList' MUST contain exactly one 'ProtocolName'
*/
static int test_TLSX_ALPN_server_response_count(void)
{
WOLFSSL_CTX* ctx = NULL;
WOLFSSL* ssl = NULL;
int ret;
int test_ret = -1;

/* ServerHello-style extensions blob: a single ALPN extension whose
* ProtocolNameList contains two entries ("h2" and "http/1.1"). */
static const unsigned char malformed_ext[] = {
0x00, 0x10, /* extension type = ALPN (16) */
0x00, 0x0E, /* extension length = 14 */
0x00, 0x0C, /* ProtocolNameList length */
0x02, 'h', '2', /* entry 1: "h2" */
0x08, 'h', 't', 't', 'p', '/', '1', '.', '1' /* entry 2 */
};
static char alpn_h2[] = "h2";

if (wolfSSL_Init() != WOLFSSL_SUCCESS)
goto cleanup;

ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
if (ctx == NULL)
goto cleanup;

ssl = wolfSSL_new(ctx);
if (ssl == NULL)
goto cleanup;

if (wolfSSL_UseALPN(ssl, alpn_h2, (unsigned int)XSTRLEN(alpn_h2),
WOLFSSL_ALPN_FAILED_ON_MISMATCH) != WOLFSSL_SUCCESS) {
goto cleanup;
}

ret = TLSX_Parse(ssl, malformed_ext, (word16)sizeof(malformed_ext),
server_hello, NULL);

if (ret != 0) {
test_ret = 0;
}
else {
fprintf(stderr,
"FAIL: TLSX_Parse accepted a server ALPN response with two "
"entries; RFC 7301 Section 3.1 requires exactly one.\n");
test_ret = -1;
}

cleanup:
if (ssl != NULL)
wolfSSL_free(ssl);
if (ctx != NULL)
wolfSSL_CTX_free(ctx);
(void)wolfSSL_Cleanup();
return test_ret;
}
#endif /* HAVE_ALPN && !NO_WOLFSSL_CLIENT && !NO_TLS && !WOLFSSL_NO_TLS12 */

int allTesting = 1;
int apiTesting = 1;
int myoptind = 0;
Expand Down Expand Up @@ -84,6 +149,15 @@ int unit_test(int argc, char** argv)
printf("starting unit tests...\n");
fflush(stdout);

#if defined(HAVE_ALPN) && !defined(NO_WOLFSSL_CLIENT) && !defined(NO_TLS) && \
!defined(WOLFSSL_NO_TLS12)
if (test_TLSX_ALPN_server_response_count() != 0) {
fprintf(stderr,
"test_TLSX_ALPN_server_response_count failed\n");
return 1;
}
#endif

#if defined(DEBUG_WOLFSSL) && !defined(HAVE_VALGRIND)
wolfSSL_Debugging_ON();
#endif
Expand Down
Loading