Skip to content

Commit 940b249

Browse files
Update to ESP-IDF to 5.1.2
1 parent 6f9142d commit 940b249

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

mbedtls-sys-espidf/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,7 @@ trusted_cert_callback = []
4646

4747
[[package.metadata.esp-idf-sys.extra_components]]
4848
bindings_header = "src/wrapper.h"
49+
50+
[package.metadata.esp-idf-sys]
51+
esp_idf_tools_install_dir = "global"
52+
esp_idf_version = "v5.1.2"

mbedtls-sys-espidf/src/lib.rs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ pub use sys::mbedtls_aria_self_test as aria_self_test;
1818
pub use sys::mbedtls_aria_setkey_dec as aria_setkey_dec;
1919
pub use sys::mbedtls_aria_setkey_enc as aria_setkey_enc;
2020
pub use sys::mbedtls_asn1_find_named_data as asn1_find_named_data;
21-
#[cfg(not(any(esp_idf_version_full = "5.0.2", esp_idf_version_full = "5.1.0")))]
22-
pub use sys::mbedtls_asn1_free_named_data as asn1_free_named_data;
2321
pub use sys::mbedtls_asn1_free_named_data_list as asn1_free_named_data_list;
2422
#[cfg(not(esp_idf_version_minor = "0"))]
2523
pub use sys::mbedtls_asn1_free_named_data_list_shallow as asn1_free_named_data_list_shallow;
@@ -324,8 +322,6 @@ pub use sys::mbedtls_md_info_from_string as md_info_from_string;
324322
pub use sys::mbedtls_md_info_from_type as md_info_from_type;
325323
pub use sys::mbedtls_md_init as md_init;
326324
pub use sys::mbedtls_md_list as md_list;
327-
#[cfg(not(esp_idf_version_full = "5.1.0"))]
328-
pub use sys::mbedtls_md_process as md_process;
329325
pub use sys::mbedtls_md_setup as md_setup;
330326
pub use sys::mbedtls_md_starts as md_starts;
331327
pub use sys::mbedtls_md_update as md_update;
@@ -453,11 +449,6 @@ pub use sys::mbedtls_pk_write_pubkey as pk_write_pubkey;
453449
pub use sys::mbedtls_pk_write_pubkey_der as pk_write_pubkey_der;
454450
pub use sys::mbedtls_pk_write_pubkey_pem as pk_write_pubkey_pem;
455451
pub use sys::mbedtls_pkcs12_derivation as pkcs12_derivation;
456-
pub use sys::mbedtls_pkcs12_pbe as pkcs12_pbe;
457-
pub use sys::mbedtls_pkcs5_pbes2 as pkcs5_pbes2;
458-
#[cfg(not(any(esp_idf_version_full = "5.0.2", esp_idf_version_full = "5.1.0")))]
459-
pub use sys::mbedtls_pkcs5_pbkdf2_hmac as pkcs5_pbkdf2_hmac;
460-
#[cfg(any(esp_idf_version_full = "5.0.2", esp_idf_version_full = "5.1.0"))]
461452
pub use sys::mbedtls_pkcs5_pbkdf2_hmac_ext as pkcs5_pbkdf2_hmac_ext;
462453
pub use sys::mbedtls_pkcs5_self_test as pkcs5_self_test;
463454
pub use sys::mbedtls_platform_gmtime_r as platform_gmtime_r;
@@ -728,9 +719,6 @@ pub use sys::mbedtls_x509write_crt_set_issuer_name as x509write_crt_set_issuer_n
728719
pub use sys::mbedtls_x509write_crt_set_key_usage as x509write_crt_set_key_usage;
729720
pub use sys::mbedtls_x509write_crt_set_md_alg as x509write_crt_set_md_alg;
730721
pub use sys::mbedtls_x509write_crt_set_ns_cert_type as x509write_crt_set_ns_cert_type;
731-
#[cfg(not(esp_idf_version_full = "5.1.0"))]
732-
pub use sys::mbedtls_x509write_crt_set_serial as x509write_crt_set_serial;
733-
#[cfg(esp_idf_version_full = "5.1.0")]
734722
pub use sys::mbedtls_x509write_crt_set_serial_raw as x509write_crt_set_serial_raw;
735723
pub use sys::mbedtls_x509write_crt_set_subject_key as x509write_crt_set_subject_key;
736724
pub use sys::mbedtls_x509write_crt_set_subject_key_identifier as x509write_crt_set_subject_key_identifier;
@@ -1127,11 +1115,7 @@ pub use sys::mbedtls_ssl_states_MBEDTLS_SSL_SERVER_HELLO as SSL_SERVER_HELLO;
11271115
pub use sys::mbedtls_ssl_states_MBEDTLS_SSL_SERVER_HELLO_DONE as SSL_SERVER_HELLO_DONE;
11281116
pub use sys::mbedtls_ssl_states_MBEDTLS_SSL_SERVER_HELLO_VERIFY_REQUEST_SENT as SSL_SERVER_HELLO_VERIFY_REQUEST_SENT;
11291117
pub use sys::mbedtls_ssl_states_MBEDTLS_SSL_SERVER_KEY_EXCHANGE as SSL_SERVER_KEY_EXCHANGE;
1130-
#[cfg(not(any(esp_idf_version_full = "5.0.2", esp_idf_version_full = "5.1.0")))]
1131-
pub use sys::mbedtls_ssl_states_MBEDTLS_SSL_SERVER_NEW_SESSION_TICKET as SSL_SERVER_NEW_SESSION_TICKET;
1132-
#[cfg(not(esp_idf_version_minor = "0"))]
11331118
pub use sys::mbedtls_ssl_states_MBEDTLS_SSL_TLS1_3_NEW_SESSION_TICKET as SSL_SERVER_NEW_SESSION_TICKETSSL_TLS1_3_NEW_SESSION_TICKET;
1134-
#[cfg(not(esp_idf_version_minor = "0"))]
11351119
pub use sys::mbedtls_ssl_states_MBEDTLS_SSL_TLS1_3_NEW_SESSION_TICKET_FLUSH as SSL_SERVER_NEW_SESSION_TICKETSSL_TLS1_3_NEW_SESSION_TICKET_FLUSH;
11361120
pub use sys::mbedtls_tls_prf_types_MBEDTLS_SSL_HKDF_EXPAND_SHA256 as SSL_HKDF_EXPAND_SHA256;
11371121
pub use sys::mbedtls_tls_prf_types_MBEDTLS_SSL_HKDF_EXPAND_SHA384 as SSL_HKDF_EXPAND_SHA384;
@@ -1836,7 +1820,6 @@ pub const CCM_STAR_DECRYPT: i32 = sys::MBEDTLS_CCM_STAR_DECRYPT as i32;
18361820
pub const CCM_STAR_ENCRYPT: i32 = sys::MBEDTLS_CCM_STAR_ENCRYPT as i32;
18371821
pub const AES_BLOCK_SIZE: i32 = sys::MBEDTLS_AES_BLOCK_SIZE as i32;
18381822
pub const DES3_BLOCK_SIZE: i32 = sys::MBEDTLS_DES3_BLOCK_SIZE as i32;
1839-
pub const CIPHER_BLKSIZE_MAX: i32 = sys::MBEDTLS_CIPHER_BLKSIZE_MAX as i32;
18401823
pub const PSA_BUILTIN_ALG_CCM: i32 = sys::MBEDTLS_PSA_BUILTIN_ALG_CCM as i32;
18411824
pub const PSA_BUILTIN_ALG_CCM_STAR_NO_TAG: i32 =
18421825
sys::MBEDTLS_PSA_BUILTIN_ALG_CCM_STAR_NO_TAG as i32;
@@ -1845,15 +1828,10 @@ pub const PSA_BUILTIN_ALG_ECDH: i32 = sys::MBEDTLS_PSA_BUILTIN_ALG_ECDH as i32;
18451828
pub const PSA_BUILTIN_ALG_ECDSA: i32 = sys::MBEDTLS_PSA_BUILTIN_ALG_ECDSA as i32;
18461829
pub const PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA: i32 =
18471830
sys::MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA as i32;
1848-
pub const PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR: i32 =
1849-
sys::MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR as i32;
18501831
pub const PSA_BUILTIN_KEY_TYPE_ECC_PUBLIC_KEY: i32 =
18511832
sys::MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_PUBLIC_KEY as i32;
18521833
pub const PSA_BUILTIN_ALG_GCM: i32 = sys::MBEDTLS_PSA_BUILTIN_ALG_GCM as i32;
18531834
pub const PSA_BUILTIN_ALG_HMAC: i32 = sys::MBEDTLS_PSA_BUILTIN_ALG_HMAC as i32;
1854-
// pub const PSA_BUILTIN_ALG_HKDF: i32 = sys::MBEDTLS_PSA_BUILTIN_ALG_HKDF as i32;
1855-
// pub const PSA_BUILTIN_ALG_HKDF_EXTRACT: i32 = sys::MBEDTLS_PSA_BUILTIN_ALG_HKDF_EXTRACT as i32;
1856-
// pub const PSA_BUILTIN_ALG_HKDF_EXPAND: i32 = sys::MBEDTLS_PSA_BUILTIN_ALG_HKDF_EXPAND as i32;
18571835
pub const PSA_BUILTIN_ALG_TLS12_PRF: i32 = sys::MBEDTLS_PSA_BUILTIN_ALG_TLS12_PRF as i32;
18581836
pub const PSA_BUILTIN_ALG_TLS12_PSK_TO_MS: i32 =
18591837
sys::MBEDTLS_PSA_BUILTIN_ALG_TLS12_PSK_TO_MS as i32;
@@ -1864,8 +1842,6 @@ pub const PSA_BUILTIN_ALG_RSA_PKCS1V15_SIGN: i32 =
18641842
sys::MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_SIGN as i32;
18651843
pub const PSA_BUILTIN_ALG_RSA_OAEP: i32 = sys::MBEDTLS_PSA_BUILTIN_ALG_RSA_OAEP as i32;
18661844
pub const PSA_BUILTIN_ALG_RSA_PSS: i32 = sys::MBEDTLS_PSA_BUILTIN_ALG_RSA_PSS as i32;
1867-
pub const PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR: i32 =
1868-
sys::MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR as i32;
18691845
pub const PSA_BUILTIN_KEY_TYPE_RSA_PUBLIC_KEY: i32 =
18701846
sys::MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_PUBLIC_KEY as i32;
18711847
pub const PSA_BUILTIN_ALG_SHA_1: i32 = sys::MBEDTLS_PSA_BUILTIN_ALG_SHA_1 as i32;

0 commit comments

Comments
 (0)