commit 457d61602f4fcf6d0f50edc2c070a674646b96b5
author Hanno Becker <hanno.becker@arm.com> Mon May 24 10:27:39 2021 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Fri Jun 18 18:40:19 2021 +0100
tree fa642b93e643f0427a2401aeb078a7186dd027ab
parent 2d6e6f8fec7fe3a116f7aefe39644bad0df6506b

Define and implement new key export API for Mbed TLS 3.0

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 94f906a..4c69a08 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -989,12 +989,11 @@
     if( ssl->conf->f_export_keys != NULL )
     {
         ssl->conf->f_export_keys( ssl->conf->p_export_keys,
-                                      master, keyblk,
-                                      mac_key_len, keylen,
-                                      iv_copy_len,
-                                      randbytes + 32,
-                                      randbytes,
-                                      tls_prf_get_type( tls_prf ) );
+                                  MBEDTLS_SSL_KEY_EXPORT_TLS12_MASTER_SECRET,
+                                  master, 48,
+                                  randbytes + 32,
+                                  randbytes,
+                                  tls_prf_get_type( tls_prf ) );
     }
 #endif
 
@@ -4186,8 +4185,8 @@
 
 #if defined(MBEDTLS_SSL_EXPORT_KEYS)
 void mbedtls_ssl_conf_export_keys_cb( mbedtls_ssl_config *conf,
-        mbedtls_ssl_export_keys_t *f_export_keys,
-        void *p_export_keys )
+                                      mbedtls_ssl_export_keys_t *f_export_keys,
+                                      void *p_export_keys )
 {
     conf->f_export_keys = f_export_keys;
     conf->p_export_keys = p_export_keys;