Skip to content

Commit 8ac7275

Browse files
committed
Fix linting issues
1 parent 948d7ae commit 8ac7275

3 files changed

Lines changed: 19 additions & 14 deletions

File tree

tests/api.c

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65388,10 +65388,14 @@ static int test_dtls_frag_ch(void)
6538865388
ExpectIntEQ(wolfSSL_dtls_set_mtu(ssl_s, DUMMY_MTU), WOLFSSL_SUCCESS);
6538965389

6539065390
/* Add in some key shares to make the CH long */
65391-
ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_ECC_SECP256R1), WOLFSSL_SUCCESS);
65392-
ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_ECC_SECP384R1), WOLFSSL_SUCCESS);
65393-
ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_ECC_SECP521R1), WOLFSSL_SUCCESS);
65394-
ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_FFDHE_2048), WOLFSSL_SUCCESS);
65391+
ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_ECC_SECP256R1),
65392+
WOLFSSL_SUCCESS);
65393+
ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_ECC_SECP384R1),
65394+
WOLFSSL_SUCCESS);
65395+
ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_ECC_SECP521R1),
65396+
WOLFSSL_SUCCESS);
65397+
ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_FFDHE_2048),
65398+
WOLFSSL_SUCCESS);
6539565399

6539665400
ExpectIntEQ(wolfSSL_dtls13_allow_ch_frag(ssl_s, 1), WOLFSSL_SUCCESS);
6539765401

@@ -65413,16 +65417,16 @@ static int test_dtls_frag_ch(void)
6541365417
ExpectIntEQ(test_ctx.c_len, 0);
6541465418

6541565419
/* CH1 */
65416-
ExpectIntEQ(wolfSSL_negotiate(ssl_c), -1);
65420+
ExpectIntEQ(wolfSSL_negotiate(ssl_c), -1);
6541765421
ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), WOLFSSL_ERROR_WANT_READ);
6541865422
/* Count records. Expect 1 unfragmented CH */
6541965423
ExpectIntEQ(test_dtls_frag_ch_count_records(test_ctx.s_buff,
6542065424
test_ctx.s_len), 1);
6542165425
/* HRR */
65422-
ExpectIntEQ(wolfSSL_negotiate(ssl_s), -1);
65426+
ExpectIntEQ(wolfSSL_negotiate(ssl_s), -1);
6542365427
ExpectIntEQ(wolfSSL_get_error(ssl_s, -1), WOLFSSL_ERROR_WANT_READ);
6542465428
/* CH2 */
65425-
ExpectIntEQ(wolfSSL_negotiate(ssl_c), -1);
65429+
ExpectIntEQ(wolfSSL_negotiate(ssl_c), -1);
6542665430
ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), WOLFSSL_ERROR_WANT_READ);
6542765431
/* Count records. Expect fragmented CH */
6542865432
ExpectIntGT(test_dtls_frag_ch_count_records(test_ctx.s_buff,

wolfssl/internal.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4730,7 +4730,7 @@ struct Options {
47304730
word16 dtls13SendMoreAcks:1; /* Send more acks during the
47314731
* handshake process */
47324732
#ifdef WOLFSSL_DTLS_CH_FRAG
4733-
word16 dtls13ChFrag:1;
4733+
word16 dtls13ChFrag:1;
47344734
#endif
47354735
#endif
47364736
#ifdef WOLFSSL_TLS13
@@ -5421,13 +5421,13 @@ struct WOLFSSL {
54215421
WOLFSSL_HEAP_HINT heap_hint;
54225422
#endif
54235423
#if defined(WOLFSSL_DTLS) && !defined(NO_WOLFSSL_SERVER)
5424-
ClientHelloGoodCb chGoodCb; /* notify user we parsed a verified
5425-
* ClientHello that passed basic tests */
5426-
void* chGoodCtx; /* user ClientHello cb context */
5424+
ClientHelloGoodCb chGoodCb; /* notify user we parsed a verified
5425+
* ClientHello that passed basic tests */
5426+
void* chGoodCtx; /* user ClientHello cb context */
54275427
#endif
54285428
#ifndef NO_HANDSHAKE_DONE_CB
5429-
HandShakeDoneCb hsDoneCb; /* notify user handshake done */
5430-
void* hsDoneCtx; /* user handshake cb context */
5429+
HandShakeDoneCb hsDoneCb; /* notify user handshake done */
5430+
void* hsDoneCtx; /* user handshake cb context */
54315431
#endif
54325432
#ifdef WOLFSSL_ASYNC_IO
54335433
#ifdef WOLFSSL_ASYNC_CRYPT

wolfssl/wolfcrypt/settings.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3016,7 +3016,8 @@ extern void uITRON4_free(void *p) ;
30163016

30173017
#if defined(HAVE_PQC) && defined(WOLFSSL_DTLS13) && \
30183018
!defined(WOLFSSL_DTLS_CH_FRAG)
3019-
#warning "Using DTLS 1.3 + pqc without WOLFSSL_DTLS_CH_FRAG will probably fail. Use --enable-dtls-frag-ch to enable it."
3019+
#warning "Using DTLS 1.3 + pqc without WOLFSSL_DTLS_CH_FRAG will probably" \
3020+
"fail.Use --enable-dtls-frag-ch to enable it."
30203021
#endif
30213022
#if !defined(WOLFSSL_DTLS13) && defined(WOLFSSL_DTLS_CH_FRAG)
30223023
#error "WOLFSSL_DTLS_CH_FRAG only works with DTLS 1.3"

0 commit comments

Comments
 (0)