Browse Source

Fix linting issues

Juliusz Sosinowicz 8 months ago
parent
commit
8ac72750bc
3 changed files with 19 additions and 14 deletions
  1. 11 7
      tests/api.c
  2. 6 6
      wolfssl/internal.h
  3. 2 1
      wolfssl/wolfcrypt/settings.h

+ 11 - 7
tests/api.c

@@ -65388,10 +65388,14 @@ static int test_dtls_frag_ch(void)
     ExpectIntEQ(wolfSSL_dtls_set_mtu(ssl_s, DUMMY_MTU), WOLFSSL_SUCCESS);
 
     /* Add in some key shares to make the CH long */
-    ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_ECC_SECP256R1), WOLFSSL_SUCCESS);
-    ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_ECC_SECP384R1), WOLFSSL_SUCCESS);
-    ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_ECC_SECP521R1), WOLFSSL_SUCCESS);
-    ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_FFDHE_2048), WOLFSSL_SUCCESS);
+    ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_ECC_SECP256R1),
+            WOLFSSL_SUCCESS);
+    ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_ECC_SECP384R1),
+            WOLFSSL_SUCCESS);
+    ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_ECC_SECP521R1),
+            WOLFSSL_SUCCESS);
+    ExpectIntEQ(wolfSSL_UseKeyShare(ssl_c, WOLFSSL_FFDHE_2048),
+            WOLFSSL_SUCCESS);
 
     ExpectIntEQ(wolfSSL_dtls13_allow_ch_frag(ssl_s, 1), WOLFSSL_SUCCESS);
 
@@ -65413,16 +65417,16 @@ static int test_dtls_frag_ch(void)
     ExpectIntEQ(test_ctx.c_len, 0);
 
     /* CH1 */
-    ExpectIntEQ(wolfSSL_negotiate(ssl_c), -1);    
+    ExpectIntEQ(wolfSSL_negotiate(ssl_c), -1);
     ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), WOLFSSL_ERROR_WANT_READ);
     /* Count records. Expect 1 unfragmented CH */
     ExpectIntEQ(test_dtls_frag_ch_count_records(test_ctx.s_buff,
             test_ctx.s_len), 1);
     /* HRR */
-    ExpectIntEQ(wolfSSL_negotiate(ssl_s), -1);    
+    ExpectIntEQ(wolfSSL_negotiate(ssl_s), -1);
     ExpectIntEQ(wolfSSL_get_error(ssl_s, -1), WOLFSSL_ERROR_WANT_READ);
     /* CH2 */
-    ExpectIntEQ(wolfSSL_negotiate(ssl_c), -1);    
+    ExpectIntEQ(wolfSSL_negotiate(ssl_c), -1);
     ExpectIntEQ(wolfSSL_get_error(ssl_c, -1), WOLFSSL_ERROR_WANT_READ);
     /* Count records. Expect fragmented CH */
     ExpectIntGT(test_dtls_frag_ch_count_records(test_ctx.s_buff,

+ 6 - 6
wolfssl/internal.h

@@ -4730,7 +4730,7 @@ struct Options {
     word16            dtls13SendMoreAcks:1;  /* Send more acks during the
                                               * handshake process */
 #ifdef WOLFSSL_DTLS_CH_FRAG
-    word16            dtls13ChFrag:1;                                          
+    word16            dtls13ChFrag:1;
 #endif
 #endif
 #ifdef WOLFSSL_TLS13
@@ -5421,13 +5421,13 @@ struct WOLFSSL {
     WOLFSSL_HEAP_HINT heap_hint;
 #endif
 #if defined(WOLFSSL_DTLS) && !defined(NO_WOLFSSL_SERVER)
-    ClientHelloGoodCb chGoodCb;        /*  notify user we parsed a verified
-                                        *  ClientHello that passed basic tests */
-    void*             chGoodCtx;       /*  user ClientHello cb context  */
+    ClientHelloGoodCb chGoodCb;        /* notify user we parsed a verified
+                                        * ClientHello that passed basic tests */
+    void*             chGoodCtx;       /* user ClientHello cb context  */
 #endif
 #ifndef NO_HANDSHAKE_DONE_CB
-    HandShakeDoneCb hsDoneCb;          /*  notify user handshake done */
-    void*           hsDoneCtx;         /*  user handshake cb context  */
+    HandShakeDoneCb hsDoneCb;          /* notify user handshake done */
+    void*           hsDoneCtx;         /* user handshake cb context  */
 #endif
 #ifdef WOLFSSL_ASYNC_IO
 #ifdef WOLFSSL_ASYNC_CRYPT

+ 2 - 1
wolfssl/wolfcrypt/settings.h

@@ -3016,7 +3016,8 @@ extern void uITRON4_free(void *p) ;
 
 #if defined(HAVE_PQC) && defined(WOLFSSL_DTLS13) && \
     !defined(WOLFSSL_DTLS_CH_FRAG)
-#warning "Using DTLS 1.3 + pqc without WOLFSSL_DTLS_CH_FRAG will probably fail. Use --enable-dtls-frag-ch to enable it."
+#warning "Using DTLS 1.3 + pqc without WOLFSSL_DTLS_CH_FRAG will probably" \
+         "fail.Use --enable-dtls-frag-ch to enable it."
 #endif
 #if !defined(WOLFSSL_DTLS13) && defined(WOLFSSL_DTLS_CH_FRAG)
 #error "WOLFSSL_DTLS_CH_FRAG only works with DTLS 1.3"