[nrf fromlist] library: psa_crypto: Fix compilation error in psa_key_derivation_abort

joerchan · de-nordic · commit a58396e34a2d · 2023-05-26T13:10:41.000Z
Fix compilation error in psa_key_derivation_abort when MBEDTLS_PSA_BUILTIN_ALG_TLS12_PRF is defined, but MBEDTLS_PSA_BUILTIN_ALG_TLS12_PSK_TO_MS is not defined. In function 'psa_key_derivation_abort': error: 'psa_tls12_prf_key_derivation_t' {aka 'struct psa_tls12_prf_key_derivation_s'} has no member named 'other_secret' Upstream PR: Mbed-TLS/mbedtls#7125 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> (cherry picked from commit 87acf5b) (cherry picked from commit adea381)
diff --git a/library/psa_crypto.c b/library/psa_crypto.c
@@ -4345,12 +4345,14 @@ psa_status_t psa_key_derivation_abort( psa_key_derivation_operation_t *operation
             mbedtls_free( operation->ctx.tls12_prf.label );
         }
 
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_TLS12_PSK_TO_MS)
         if( operation->ctx.tls12_prf.other_secret != NULL )
         {
             mbedtls_platform_zeroize( operation->ctx.tls12_prf.other_secret,
                                       operation->ctx.tls12_prf.other_secret_length );
             mbedtls_free( operation->ctx.tls12_prf.other_secret );
         }
+#endif
 
         status = PSA_SUCCESS;
 

Original file line number	Diff line number	Diff line change
`@@ -4345,12 +4345,14 @@ psa_status_t psa_key_derivation_abort( psa_key_derivation_operation_t *operation`
`4345`	`4345`	`mbedtls_free( operation->ctx.tls12_prf.label );`
`4346`	`4346`	`}`
`4347`	`4347`
	`4348`	`+#if defined(MBEDTLS_PSA_BUILTIN_ALG_TLS12_PSK_TO_MS)`
`4348`	`4349`	`if( operation->ctx.tls12_prf.other_secret != NULL )`
`4349`	`4350`	`{`
`4350`	`4351`	`mbedtls_platform_zeroize( operation->ctx.tls12_prf.other_secret,`
`4351`	`4352`	`operation->ctx.tls12_prf.other_secret_length );`
`4352`	`4353`	`mbedtls_free( operation->ctx.tls12_prf.other_secret );`
`4353`	`4354`	`}`
	`4355`	`+#endif`
`4354`	`4356`
`4355`	`4357`	`status = PSA_SUCCESS;`
`4356`	`4358`