From 3b07f5d8e3bc9f3e440459a8ffc6e8caa2f66a1f Mon Sep 17 00:00:00 2001
From: Elms <jeff@wolfssl.com>
Date: Tue, 5 Jan 2021 13:12:12 -0800
Subject: [PATCH] EVP: expand tests for `EVP_CIPHER_block_size`

---
 tests/api.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/tests/api.c b/tests/api.c
index 9878ccff2..38ad80895 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -34624,10 +34624,64 @@ static void test_wolfSSL_EVP_CIPHER_block_size(void)
 {
 #if defined(OPENSSL_ALL)
 
+#ifdef HAVE_AES_CBC
+    #ifdef WOLFSSL_AES_128
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_128_cbc()), AES_BLOCK_SIZE);
+    #endif
+    #ifdef WOLFSSL_AES_192
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_192_cbc()), AES_BLOCK_SIZE);
+    #endif
+    #ifdef WOLFSSL_AES_256
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_256_cbc()), AES_BLOCK_SIZE);
+    #endif
+#endif
+
+#ifdef HAVE_AES_GCM
+    #ifdef WOLFSSL_AES_128
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_128_gcm()), 1);
+    #endif
+    #ifdef WOLFSSL_AES_192
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_192_gcm()), 1);
+    #endif
+    #ifdef WOLFSSL_AES_256
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_256_gcm()), 1);
+    #endif
+#endif
+
+#ifdef WOLFSSL_AES_COUNTER
+    #ifdef WOLFSSL_AES_128
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_128_ctr()), AES_BLOCK_SIZE);
+    #endif
+    #ifdef WOLFSSL_AES_192
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_192_ctr()), AES_BLOCK_SIZE);
+    #endif
+    #ifdef WOLFSSL_AES_256
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_256_ctr()), AES_BLOCK_SIZE);
+    #endif
+#endif
+
+#ifdef WOLFSSL_AES_ECB
+    #ifdef WOLFSSL_AES_128
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_128_ecb()), AES_BLOCK_SIZE);
+    #endif
+    #ifdef WOLFSSL_AES_192
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_192_ecb()), AES_BLOCK_SIZE);
+    #endif
+    #ifdef WOLFSSL_AES_256
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_256_ecb()), AES_BLOCK_SIZE);
+    #endif
+#endif
+
 #ifdef WOLFSSL_AES_OFB
+    #ifdef WOLFSSL_AES_128
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_128_ofb()), 1);
+    #endif
     #ifdef WOLFSSL_AES_192
     AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_192_ofb()), 1);
     #endif
+    #ifdef WOLFSSL_AES_256
+    AssertIntEQ(EVP_CIPHER_block_size(EVP_aes_256_ofb()), 1);
+    #endif
 #endif
 
 #ifndef NO_RC4