mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-12-03 11:51:24 +03:00
Fix up merge conflict resolution
Signed-off-by: Max Fillinger <maximilian.fillinger@foxcrypto.com>
This commit is contained in:
@@ -5229,6 +5229,7 @@ exit:
|
|||||||
mbedtls_debug_set_threshold(0);
|
mbedtls_debug_set_threshold(0);
|
||||||
mbedtls_free(first_frag);
|
mbedtls_free(first_frag);
|
||||||
PSA_DONE();
|
PSA_DONE();
|
||||||
|
}
|
||||||
/* END_CASE */
|
/* END_CASE */
|
||||||
|
|
||||||
/* BEGIN_CASE depends_on:MBEDTLS_SSL_KEYING_MATERIAL_EXPORT:MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED:PSA_WANT_ECC_SECP_R1_384:PSA_WANT_ALG_SHA_256 */
|
/* BEGIN_CASE depends_on:MBEDTLS_SSL_KEYING_MATERIAL_EXPORT:MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED:PSA_WANT_ECC_SECP_R1_384:PSA_WANT_ALG_SHA_256 */
|
||||||
|
|||||||
Reference in New Issue
Block a user