esp: fix silly cbc bug, and add cbc hmac 256 test.

Author: philljj

.github/workflows/linux.yml

@@ -37,6 +37,10 @@ jobs:
           sudo ./build/test-esp -m 0
           sudo killall tcpdump || true
           sudo ./tools/ip-xfrm/delete_all
+          sudo ./tools/ip-xfrm/cbc_auth sha256 128
+          sudo ./build/test-esp -m 1
+          sudo killall tcpdump || true
+          sudo ./tools/ip-xfrm/delete_all
 
       - name: Run standalone wolfssl test
         run: |

src/test/test_esp.c

@@ -38,9 +38,6 @@
 #include "wolfesp.h"
 
 static void __attribute__((noreturn)) print_usage_and_die(void);
-#if 0
-#include "esp_sa_list.c"
-#endif
 
 #define TEST_SIZE (12 * 1024)
 
@@ -606,7 +603,7 @@ int main(int argc, char **argv)
 
             err = wolfIP_esp_sa_new_cbc_sha256(0, out_sa_cbc, atoip4(WOLFIP_IP),
                                                atoip4(HOST_STACK_IP),
-                                               out_enc_key, sizeof(out_enc_key - 4),
+                                               out_enc_key, sizeof(out_enc_key) - 4,
                                                out_auth_key, sizeof(out_auth_key),
                                                ESP_ICVLEN_HMAC_128);
             break;

src/wolfesp.c

@@ -541,7 +541,7 @@ esp_aes_rfc3602_enc(const struct wolfIP_esp_sa * esp_sa, uint8_t * esp_data,
     }
 
     inited = 1;
-    ret = wc_AesSetKey(&cbc_enc, esp_sa->enc_key, AES_BLOCK_SIZE,
+    ret = wc_AesSetKey(&cbc_enc, esp_sa->enc_key, esp_sa->enc_key_len,
                        iv, AES_ENCRYPTION);
 
     if (ret != 0) {