From 31d9db6195d452ee4e66cd2f0f9214e9d28718d7 Mon Sep 17 00:00:00 2001
From: Jarno Lamsa <jarno.lamsa@arm.com>
Date: Mon, 1 Apr 2019 14:33:49 +0300
Subject: [PATCH] Change the verify function naming

Change the naming to reflect that the function uses a new ca callback
feature to distinguish different callbacks.
---
 include/mbedtls/x509_crt.h                 |  4 ++--
 library/x509_crt.c                         | 12 ++++++------
 tests/suites/test_suite_x509parse.function |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/mbedtls/x509_crt.h b/include/mbedtls/x509_crt.h
index 800e64ba8d..67a24f0299 100644
--- a/include/mbedtls/x509_crt.h
+++ b/include/mbedtls/x509_crt.h
@@ -523,7 +523,7 @@ int mbedtls_x509_crt_verify_restartable( mbedtls_x509_crt *crt,
  * \brief               The type of trusted certificate callbacks.
  *
  *                      Callbacks of this type are passed to and used by the CRT
- *                      verification routine mbedtls_x509_crt_verify_with_cb()
+ *                      verification routine mbedtls_x509_crt_verify_with_ca_cb()
  *                      when looking for trusted signers of a given certificate.
  *
  *                      On success, the callback returns a list of trusted
@@ -574,7 +574,7 @@ typedef int (*mbedtls_x509_crt_ca_cb_t)( void *p_ctx,
  *
  * \return         See \c mbedtls_crt_verify_with_profile().
  */
-int mbedtls_x509_crt_verify_with_cb( mbedtls_x509_crt *crt,
+int mbedtls_x509_crt_verify_with_ca_cb( mbedtls_x509_crt *crt,
                      mbedtls_x509_crt_ca_cb_t f_ca_cb,
                      void *p_ca_cb,
                      const mbedtls_x509_crt_profile *profile,
diff --git a/library/x509_crt.c b/library/x509_crt.c
index b74ebffa2b..5850ccf77b 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -2587,7 +2587,7 @@ static int x509_crt_merge_flags_with_cb(
  * of trusted signers, and `ca_crl` will be use as the static list
  * of CRLs.
  */
-static int mbedtls_x509_crt_verify_restartable_cb( mbedtls_x509_crt *crt,
+static int mbedtls_x509_crt_verify_restartable_ca_cb( mbedtls_x509_crt *crt,
                      mbedtls_x509_crt *trust_ca,
                      mbedtls_x509_crl *ca_crl,
                      mbedtls_x509_crt_ca_cb_t f_ca_cb,
@@ -2682,7 +2682,7 @@ int mbedtls_x509_crt_verify( mbedtls_x509_crt *crt,
                      int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
                      void *p_vrfy )
 {
-    return( mbedtls_x509_crt_verify_restartable_cb( crt, trust_ca, ca_crl,
+    return( mbedtls_x509_crt_verify_restartable_ca_cb( crt, trust_ca, ca_crl,
                                          NULL, NULL,
                                          &mbedtls_x509_crt_profile_default,
                                          cn, flags,
@@ -2700,7 +2700,7 @@ int mbedtls_x509_crt_verify_with_profile( mbedtls_x509_crt *crt,
                      int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
                      void *p_vrfy )
 {
-    return( mbedtls_x509_crt_verify_restartable_cb( crt, trust_ca, ca_crl,
+    return( mbedtls_x509_crt_verify_restartable_ca_cb( crt, trust_ca, ca_crl,
                                                  NULL, NULL,
                                                  profile, cn, flags,
                                                  f_vrfy, p_vrfy, NULL ) );
@@ -2711,7 +2711,7 @@ int mbedtls_x509_crt_verify_with_profile( mbedtls_x509_crt *crt,
  * Verify the certificate validity (user-chosen profile, CA callback,
  *                                  not restartable).
  */
-int mbedtls_x509_crt_verify_with_cb( mbedtls_x509_crt *crt,
+int mbedtls_x509_crt_verify_with_ca_cb( mbedtls_x509_crt *crt,
                      mbedtls_x509_crt_ca_cb_t f_ca_cb,
                      void *p_ca_cb,
                      const mbedtls_x509_crt_profile *profile,
@@ -2719,7 +2719,7 @@ int mbedtls_x509_crt_verify_with_cb( mbedtls_x509_crt *crt,
                      int (*f_vrfy)(void *, mbedtls_x509_crt *, int, uint32_t *),
                      void *p_vrfy )
 {
-    return( mbedtls_x509_crt_verify_restartable_cb( crt, NULL, NULL,
+    return( mbedtls_x509_crt_verify_restartable_ca_cb( crt, NULL, NULL,
                                                  f_ca_cb, p_ca_cb,
                                                  profile, cn, flags,
                                                  f_vrfy, p_vrfy, NULL ) );
@@ -2735,7 +2735,7 @@ int mbedtls_x509_crt_verify_restartable( mbedtls_x509_crt *crt,
                      void *p_vrfy,
                      mbedtls_x509_crt_restart_ctx *rs_ctx )
 {
-    return( mbedtls_x509_crt_verify_restartable_cb( crt, trust_ca, ca_crl,
+    return( mbedtls_x509_crt_verify_restartable_ca_cb( crt, trust_ca, ca_crl,
                                                  NULL, NULL,
                                                  profile, cn, flags,
                                                  f_vrfy, p_vrfy, rs_ctx ) );
diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index b08949ad48..c51d54aab6 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -446,7 +446,7 @@ void x509_verify( char *crt_file, char *ca_file, char *crl_file,
     {
         flags = 0;
 
-        res = mbedtls_x509_crt_verify_with_cb( &crt, ca_callback, &ca, profile, cn_name, &flags, f_vrfy, NULL );
+        res = mbedtls_x509_crt_verify_with_ca_cb( &crt, ca_callback, &ca, profile, cn_name, &flags, f_vrfy, NULL );
 
         TEST_ASSERT( res == ( result ) );
         TEST_ASSERT( flags == (uint32_t)( flags_result ) );
@@ -477,7 +477,7 @@ void x509_verify_ca_cb_failure( char *crt_file, char *ca_file, char *name,
     if( strcmp( name, "NULL" ) == 0 )
         name = NULL;
 
-    ret = mbedtls_x509_crt_verify_with_cb( &crt, ca_callback_fail, &ca,
+    ret = mbedtls_x509_crt_verify_with_ca_cb( &crt, ca_callback_fail, &ca,
                                            &compat_profile, name, &flags,
                                            verify_all, NULL );