commit 2d6e6f8fec7fe3a116f7aefe39644bad0df6506b
author Hanno Becker <hanno.becker@arm.com> Mon May 24 10:58:31 2021 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Fri Jun 18 18:40:19 2021 +0100
tree 7a2aefd5d9b18d5baf0bbee9c815eec4ffe290d9
parent 78ba2af7c2e24626bb01fece73513a06c4a4fa74

Remove '_ext' suffix from SSL key exporter API

Signed-off-by: Hanno Becker <hanno.becker@arm.com>

include/mbedtls/ssl.h

diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 6c24aab..410ac0e 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -1035,7 +1035,7 @@
 #if defined(MBEDTLS_SSL_EXPORT_KEYS)
     /** Callback to export key block, master secret,
      *  tls_prf and random bytes. Should replace f_export_keys    */
-    int (*MBEDTLS_PRIVATE(f_export_keys_ext))( void *, const unsigned char *,
+    int (*MBEDTLS_PRIVATE(f_export_keys))( void *, const unsigned char *,
                 const unsigned char *, size_t, size_t, size_t,
                 const unsigned char[32], const unsigned char[32],
                 mbedtls_tls_prf_types );
@@ -1941,7 +1941,7 @@
  * \return          0 if successful, or
  *                  a specific MBEDTLS_ERR_XXX code.
  */
-typedef int mbedtls_ssl_export_keys_ext_t( void *p_expkey,
+typedef int mbedtls_ssl_export_keys_t( void *p_expkey,
                                            const unsigned char *ms,
                                            const unsigned char *kb,
                                            size_t maclen,
@@ -2020,16 +2020,16 @@
  * \brief           Configure extended key export callback.
  *                  (Default: none.)
  *
- * \note            See \c mbedtls_ssl_export_keys_ext_t.
+ * \note            See \c mbedtls_ssl_export_keys_t.
  * \warning         Exported key material must not be used for any purpose
  *                  before the (D)TLS handshake is completed
  *
  * \param conf      SSL configuration context
- * \param f_export_keys_ext Callback for exporting keys
+ * \param f_export_keys Callback for exporting keys
  * \param p_export_keys     Context for the callback
  */
-void mbedtls_ssl_conf_export_keys_ext_cb( mbedtls_ssl_config *conf,
-        mbedtls_ssl_export_keys_ext_t *f_export_keys_ext,
+void mbedtls_ssl_conf_export_keys_cb( mbedtls_ssl_config *conf,
+        mbedtls_ssl_export_keys_t *f_export_keys,
         void *p_export_keys );
 #endif /* MBEDTLS_SSL_EXPORT_KEYS */