commit 01e42d2d4c2b5085d69cebe6babe711773041147
author Jerry Yu <jerry.h.yu@arm.com> Sun Aug 21 12:55:51 2022 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Sun Aug 21 13:00:07 2022 +0800
tree 163181f91a12c04588a040c47b5a3d8d0a181e59
parent 9f7f646b11d669341da088f0ee9c30e449f99e08

fix issues in export handshake psk

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>

library/ssl_tls13_keys.c

diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c
index 01e956f..c11ad28 100644
--- a/library/ssl_tls13_keys.c
+++ b/library/ssl_tls13_keys.c
@@ -1567,12 +1567,12 @@
     return( ret );
 }
 
-
+#if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
 int mbedtls_ssl_tls13_export_handshake_psk( mbedtls_ssl_context *ssl,
                                             unsigned char **psk,
                                             size_t *psk_len )
 {
-#if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
+
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
     psa_key_attributes_t key_attributes = PSA_KEY_ATTRIBUTES_INIT;
     psa_status_t status;
@@ -1581,7 +1581,7 @@
     *psk = NULL;
 
     if( mbedtls_svc_key_id_is_null( ssl->handshake->psk_opaque ) )
-        return( 0 );
+        return( MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED );
 
     status = psa_get_key_attributes( ssl->handshake->psk_opaque, &key_attributes );
     if( status != PSA_SUCCESS )
@@ -1612,14 +1612,8 @@
         return( MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED );
     return( 0 );
 #endif /* !MBEDTLS_USE_PSA_CRYPTO */
-#else /* MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */
-    ((void) ssl);
-    *psk = NULL;
-    *psk_len = 0;
-    return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
-#endif /* !MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */
-
 }
+#endif /* MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */
 
 #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */