From 08b223443f5611e678f52fbb808d34be63b38e9a Mon Sep 17 00:00:00 2001
From: Tuvshinzaya Erdenekhuu <tuvshinzaya.erdenekhuu@arm.com>
Date: Thu, 1 Sep 2022 16:18:00 +0100
Subject: [PATCH] Add new tests

Signed-off-by: Tuvshinzaya Erdenekhuu <tuvshinzaya.erdenekhuu@arm.com>
---
 tests/suites/test_suite_rsa.function | 55 ++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 8 deletions(-)

diff --git a/tests/suites/test_suite_rsa.function b/tests/suites/test_suite_rsa.function
index 5bba023fe4..ad52e98cd4 100644
--- a/tests/suites/test_suite_rsa.function
+++ b/tests/suites/test_suite_rsa.function
@@ -33,16 +33,27 @@ void rsa_invalid_param( )
                 MBEDTLS_ERR_RSA_INVALID_PADDING );
 
     TEST_EQUAL( mbedtls_rsa_pkcs1_sign(&ctx, NULL,
-                                       NULL, md_alg_none,
+                                       NULL, MBEDTLS_MD_NONE,
                                        buf_len,
                                        NULL, buf),
                 MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
 
-    TEST_EQUAL( mbedtls_rsa_pkcs1_verify(&ctx, md_alg_none,
+    TEST_EQUAL( mbedtls_rsa_pkcs1_sign(&ctx, NULL,
+                                       NULL, MBEDTLS_MD_SHA256,
+                                       0,
+                                       NULL, buf),
+                MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    TEST_EQUAL( mbedtls_rsa_pkcs1_verify(&ctx, MBEDTLS_MD_NONE,
                                          buf_len,
                                          NULL, buf),
                 MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
 
+    TEST_EQUAL( mbedtls_rsa_pkcs1_verify(&ctx, MBEDTLS_MD_SHA256,
+                                         0,
+                                         NULL, buf),
+                MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
 #if !defined(MBEDTLS_PKCS1_V15)
     TEST_EQUAL( mbedtls_rsa_set_padding( &ctx,
                                          MBEDTLS_RSA_PKCS_V15,
@@ -52,16 +63,28 @@ void rsa_invalid_param( )
 
 #if defined(MBEDTLS_PKCS1_V15)
     TEST_EQUAL( mbedtls_rsa_rsassa_pkcs1_v15_sign(&ctx, NULL,
-                                              NULL, md_alg_none,
+                                              NULL, MBEDTLS_MD_NONE,
                                               buf_len,
                                               NULL, buf),
                 MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
 
-    TEST_EQUAL( mbedtls_rsa_rsassa_pkcs1_v15_verify(&ctx, md_alg_none,
+    TEST_EQUAL( mbedtls_rsa_rsassa_pkcs1_v15_sign(&ctx, NULL,
+                                              NULL, MBEDTLS_MD_SHA256,
+                                              0,
+                                              NULL, buf),
+                MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    TEST_EQUAL( mbedtls_rsa_rsassa_pkcs1_v15_verify(&ctx, MBEDTLS_MD_NONE,
                                                 buf_len,
                                                 NULL, buf),
                 MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
 
+    TEST_EQUAL( mbedtls_rsa_rsassa_pkcs1_v15_verify(&ctx, MBEDTLS_MD_SHA256,
+                                                0,
+                                                NULL, buf),
+                MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+
 #endif
 
 #if !defined(MBEDTLS_PKCS1_V21)
@@ -73,22 +96,38 @@ void rsa_invalid_param( )
 
 #if defined(MBEDTLS_PKCS1_V21)
     TEST_EQUAL( mbedtls_rsa_rsassa_pss_sign_ext(&ctx, NULL, NULL,
-                                    md_alg_none, buf_len,
+                                    MBEDTLS_MD_NONE, buf_len,
                                     NULL, buf_len,
                                     buf ),
                 MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
 
-    TEST_EQUAL( mbedtls_rsa_rsassa_pss_verify_ext(&ctx, md_alg_none,
+    TEST_EQUAL( mbedtls_rsa_rsassa_pss_sign_ext(&ctx, NULL, NULL,
+                                    MBEDTLS_MD_SHA256, 0,
+                                    NULL, buf_len,
+                                    buf ),
+                MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    TEST_EQUAL( mbedtls_rsa_rsassa_pss_verify_ext(&ctx, MBEDTLS_MD_NONE,
                                                   buf_len, NULL,
-                                                  md_alg_none,
+                                                  MBEDTLS_MD_NONE,
                                                   buf_len, buf),
                 MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
 
-    TEST_EQUAL( mbedtls_rsa_rsassa_pss_verify(&ctx, md_alg_none,
+    TEST_EQUAL( mbedtls_rsa_rsassa_pss_verify_ext(&ctx, MBEDTLS_MD_SHA256,
+                                                  0, NULL,
+                                                  MBEDTLS_MD_NONE,
+                                                  buf_len, buf),
+                MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
+
+    TEST_EQUAL( mbedtls_rsa_rsassa_pss_verify(&ctx, MBEDTLS_MD_NONE,
                                               buf_len,
                                               NULL, buf),
                 MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
 
+    TEST_EQUAL( mbedtls_rsa_rsassa_pss_verify(&ctx, MBEDTLS_MD_SHA256,
+                                              0,
+                                              NULL, buf),
+                MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
 #endif
 
 exit: