Skip to content

Commit 3765e5c

Browse files
Merge pull request #10438 from bjwtaylor/deprecated-functions
Remove internal deprecated items
2 parents d4b6bc7 + 91b8310 commit 3765e5c

File tree

3 files changed

+0
-63
lines changed

3 files changed

+0
-63
lines changed

library/ssl_misc.h

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -775,11 +775,6 @@ struct mbedtls_ssl_handshake_params {
775775
uint16_t received_sig_algs[MBEDTLS_RECEIVED_SIG_ALGS_SIZE];
776776
#endif
777777

778-
#if !defined(MBEDTLS_DEPRECATED_REMOVED)
779-
const uint16_t *group_list;
780-
const uint16_t *sig_algs;
781-
#endif
782-
783778
#if defined(MBEDTLS_KEY_EXCHANGE_SOME_XXDH_PSA_ANY_ENABLED)
784779
psa_key_type_t xxdh_psa_type;
785780
size_t xxdh_psa_bits;
@@ -2306,12 +2301,6 @@ static inline const void *mbedtls_ssl_get_sig_algs(
23062301
{
23072302
#if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
23082303

2309-
#if !defined(MBEDTLS_DEPRECATED_REMOVED)
2310-
if (ssl->handshake != NULL &&
2311-
ssl->handshake->sig_algs != NULL) {
2312-
return ssl->handshake->sig_algs;
2313-
}
2314-
#endif
23152304
return ssl->conf->sig_algs;
23162305

23172306
#else /* MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED */
@@ -2576,37 +2565,6 @@ psa_status_t mbedtls_ssl_cipher_to_psa(mbedtls_cipher_type_t mbedtls_cipher_type
25762565
psa_key_type_t *key_type,
25772566
size_t *key_size);
25782567

2579-
#if !defined(MBEDTLS_DEPRECATED_REMOVED)
2580-
/**
2581-
* \brief Convert given PSA status to mbedtls error code.
2582-
*
2583-
* \param status [in] given PSA status
2584-
*
2585-
* \return corresponding mbedtls error code
2586-
*/
2587-
static inline MBEDTLS_DEPRECATED int psa_ssl_status_to_mbedtls(psa_status_t status)
2588-
{
2589-
switch (status) {
2590-
case PSA_SUCCESS:
2591-
return 0;
2592-
case PSA_ERROR_INSUFFICIENT_MEMORY:
2593-
return MBEDTLS_ERR_SSL_ALLOC_FAILED;
2594-
case PSA_ERROR_NOT_SUPPORTED:
2595-
return MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE;
2596-
case PSA_ERROR_INVALID_SIGNATURE:
2597-
return MBEDTLS_ERR_SSL_INVALID_MAC;
2598-
case PSA_ERROR_INVALID_ARGUMENT:
2599-
return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
2600-
case PSA_ERROR_BAD_STATE:
2601-
return MBEDTLS_ERR_SSL_INTERNAL_ERROR;
2602-
case PSA_ERROR_BUFFER_TOO_SMALL:
2603-
return MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL;
2604-
default:
2605-
return MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED;
2606-
}
2607-
}
2608-
#endif /* !MBEDTLS_DEPRECATED_REMOVED */
2609-
26102568
#if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED)
26112569

26122570
typedef enum {

library/ssl_tls.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4368,9 +4368,6 @@ void mbedtls_ssl_handshake_free(mbedtls_ssl_context *ssl)
43684368
}
43694369

43704370
#if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
4371-
#if !defined(MBEDTLS_DEPRECATED_REMOVED)
4372-
handshake->sig_algs = NULL;
4373-
#endif /* MBEDTLS_DEPRECATED_REMOVED */
43744371
#if defined(MBEDTLS_SSL_PROTO_TLS1_3)
43754372
if (ssl->handshake->certificate_request_context) {
43764373
mbedtls_free((void *) handshake->certificate_request_context);

tests/suites/test_suite_x509write.function

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,6 @@ void x509_crt_check(char *subject_key_file, char *subject_pwd,
318318
unsigned char check_buf[5000];
319319
unsigned char *p, *end;
320320
unsigned char tag, sz;
321-
#if defined(MBEDTLS_TEST_DEPRECATED) && defined(MBEDTLS_BIGNUM_C)
322-
mbedtls_mpi serial_mpi;
323-
#endif
324321
int ret, before_tag, after_tag;
325322
size_t olen = 0, pem_len = 0, buf_index = 0;
326323
int der_len = -1;
@@ -373,9 +370,6 @@ void x509_crt_check(char *subject_key_file, char *subject_pwd,
373370
}
374371

375372
memset(&rnd_info, 0x2a, sizeof(mbedtls_test_rnd_pseudo_info));
376-
#if defined(MBEDTLS_TEST_DEPRECATED) && defined(MBEDTLS_BIGNUM_C)
377-
mbedtls_mpi_init(&serial_mpi);
378-
#endif
379373

380374
mbedtls_pk_init(&subject_key);
381375
mbedtls_pk_init(&issuer_key);
@@ -561,9 +555,6 @@ exit:
561555
mbedtls_pk_free(&issuer_key_alt);
562556
mbedtls_pk_free(&subject_key);
563557
mbedtls_pk_free(&issuer_key);
564-
#if defined(MBEDTLS_TEST_DEPRECATED) && defined(MBEDTLS_BIGNUM_C)
565-
mbedtls_mpi_free(&serial_mpi);
566-
#endif
567558
psa_destroy_key(key_id);
568559
MD_OR_USE_PSA_DONE();
569560
}
@@ -575,11 +566,6 @@ void x509_set_serial_check()
575566
mbedtls_x509write_cert ctx;
576567
uint8_t invalid_serial[MBEDTLS_X509_RFC5280_MAX_SERIAL_LEN + 1];
577568

578-
#if defined(MBEDTLS_TEST_DEPRECATED) && defined(MBEDTLS_BIGNUM_C)
579-
mbedtls_mpi serial_mpi;
580-
mbedtls_mpi_init(&serial_mpi);
581-
#endif
582-
583569
USE_PSA_INIT();
584570
memset(invalid_serial, 0x01, sizeof(invalid_serial));
585571

@@ -588,11 +574,7 @@ void x509_set_serial_check()
588574
MBEDTLS_ERR_X509_BAD_INPUT_DATA);
589575

590576
exit:
591-
#if defined(MBEDTLS_TEST_DEPRECATED) && defined(MBEDTLS_BIGNUM_C)
592-
mbedtls_mpi_free(&serial_mpi);
593-
#else
594577
;
595-
#endif
596578
USE_PSA_DONE();
597579
}
598580
/* END_CASE */

0 commit comments

Comments
 (0)