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>

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index e6bc790..94f906a 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -986,9 +986,9 @@
     ((void) mac_enc);
 
 #if defined(MBEDTLS_SSL_EXPORT_KEYS)
-    if( ssl->conf->f_export_keys_ext != NULL )
+    if( ssl->conf->f_export_keys != NULL )
     {
-        ssl->conf->f_export_keys_ext( ssl->conf->p_export_keys,
+        ssl->conf->f_export_keys( ssl->conf->p_export_keys,
                                       master, keyblk,
                                       mac_key_len, keylen,
                                       iv_copy_len,
@@ -4185,11 +4185,11 @@
 #endif /* MBEDTLS_SSL_SESSION_TICKETS */
 
 #if defined(MBEDTLS_SSL_EXPORT_KEYS)
-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 )
 {
-    conf->f_export_keys_ext = f_export_keys_ext;
+    conf->f_export_keys = f_export_keys;
     conf->p_export_keys = p_export_keys;
 }
 #endif