mirror of
https://github.com/ARMmbed/mbedtls.git
synced 2025-05-30 09:42:32 +08:00
Allow USE_PSA_CRYPTO for handshake TLS tests
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
parent
0760ade761
commit
46a1760922
@ -1874,6 +1874,8 @@ void perform_handshake( handshake_test_options* options )
|
|||||||
#endif
|
#endif
|
||||||
int expected_handshake_result = 0;
|
int expected_handshake_result = 0;
|
||||||
|
|
||||||
|
USE_PSA_INIT( );
|
||||||
|
|
||||||
mbedtls_test_message_queue server_queue, client_queue;
|
mbedtls_test_message_queue server_queue, client_queue;
|
||||||
mbedtls_test_message_socket_context server_context, client_context;
|
mbedtls_test_message_socket_context server_context, client_context;
|
||||||
mbedtls_message_socket_init( &server_context );
|
mbedtls_message_socket_init( &server_context );
|
||||||
@ -2232,6 +2234,7 @@ exit:
|
|||||||
if( context_buf != NULL )
|
if( context_buf != NULL )
|
||||||
mbedtls_free( context_buf );
|
mbedtls_free( context_buf );
|
||||||
#endif
|
#endif
|
||||||
|
USE_PSA_DONE( );
|
||||||
}
|
}
|
||||||
#endif /* MBEDTLS_X509_CRT_PARSE_C && MBEDTLS_ENTROPY_C && MBEDTLS_CTR_DRBG_C */
|
#endif /* MBEDTLS_X509_CRT_PARSE_C && MBEDTLS_ENTROPY_C && MBEDTLS_CTR_DRBG_C */
|
||||||
|
|
||||||
@ -4755,7 +4758,7 @@ exit:
|
|||||||
}
|
}
|
||||||
/* END_CASE */
|
/* END_CASE */
|
||||||
|
|
||||||
/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:!MBEDTLS_USE_PSA_CRYPTO:MBEDTLS_PKCS1_V15:MBEDTLS_RSA_C:MBEDTLS_ECP_DP_SECP384R1_ENABLED:MBEDTLS_ENTROPY_C:MBEDTLS_CTR_DRBG_C */
|
/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_PKCS1_V15:MBEDTLS_RSA_C:MBEDTLS_ECP_DP_SECP384R1_ENABLED:MBEDTLS_ENTROPY_C:MBEDTLS_CTR_DRBG_C */
|
||||||
void handshake_version( int dtls, int client_min_version, int client_max_version,
|
void handshake_version( int dtls, int client_min_version, int client_max_version,
|
||||||
int server_min_version, int server_max_version,
|
int server_min_version, int server_max_version,
|
||||||
int expected_negotiated_version )
|
int expected_negotiated_version )
|
||||||
@ -4778,7 +4781,7 @@ void handshake_version( int dtls, int client_min_version, int client_max_version
|
|||||||
}
|
}
|
||||||
/* END_CASE */
|
/* END_CASE */
|
||||||
|
|
||||||
/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:!MBEDTLS_USE_PSA_CRYPTO:MBEDTLS_PKCS1_V15:MBEDTLS_SSL_PROTO_TLS1_2:MBEDTLS_ENTROPY_C:MBEDTLS_CTR_DRBG_C */
|
/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_PKCS1_V15:MBEDTLS_SSL_PROTO_TLS1_2:MBEDTLS_ENTROPY_C:MBEDTLS_CTR_DRBG_C */
|
||||||
void handshake_psk_cipher( char* cipher, int pk_alg, data_t *psk_str, int dtls )
|
void handshake_psk_cipher( char* cipher, int pk_alg, data_t *psk_str, int dtls )
|
||||||
{
|
{
|
||||||
handshake_test_options options;
|
handshake_test_options options;
|
||||||
@ -4796,7 +4799,7 @@ void handshake_psk_cipher( char* cipher, int pk_alg, data_t *psk_str, int dtls )
|
|||||||
}
|
}
|
||||||
/* END_CASE */
|
/* END_CASE */
|
||||||
|
|
||||||
/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:!MBEDTLS_USE_PSA_CRYPTO:MBEDTLS_PKCS1_V15:MBEDTLS_SSL_PROTO_TLS1_2:MBEDTLS_ENTROPY_C:MBEDTLS_CTR_DRBG_C */
|
/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_PKCS1_V15:MBEDTLS_SSL_PROTO_TLS1_2:MBEDTLS_ENTROPY_C:MBEDTLS_CTR_DRBG_C */
|
||||||
void handshake_cipher( char* cipher, int pk_alg, int dtls )
|
void handshake_cipher( char* cipher, int pk_alg, int dtls )
|
||||||
{
|
{
|
||||||
test_handshake_psk_cipher( cipher, pk_alg, NULL, dtls );
|
test_handshake_psk_cipher( cipher, pk_alg, NULL, dtls );
|
||||||
@ -4806,7 +4809,7 @@ void handshake_cipher( char* cipher, int pk_alg, int dtls )
|
|||||||
}
|
}
|
||||||
/* END_CASE */
|
/* END_CASE */
|
||||||
|
|
||||||
/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:!MBEDTLS_USE_PSA_CRYPTO:MBEDTLS_PKCS1_V15:MBEDTLS_SSL_PROTO_TLS1_2:MBEDTLS_RSA_C:MBEDTLS_ECP_DP_SECP384R1_ENABLED:MBEDTLS_ENTROPY_C:MBEDTLS_CTR_DRBG_C */
|
/* BEGIN_CASE depends_on:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_PKCS1_V15:MBEDTLS_SSL_PROTO_TLS1_2:MBEDTLS_RSA_C:MBEDTLS_ECP_DP_SECP384R1_ENABLED:MBEDTLS_ENTROPY_C:MBEDTLS_CTR_DRBG_C */
|
||||||
void app_data( int mfl, int cli_msg_len, int srv_msg_len,
|
void app_data( int mfl, int cli_msg_len, int srv_msg_len,
|
||||||
int expected_cli_fragments,
|
int expected_cli_fragments,
|
||||||
int expected_srv_fragments, int dtls )
|
int expected_srv_fragments, int dtls )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user