Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify Mbed TLS version to most recent realease #27

Merged
merged 1 commit into from
Jun 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,15 @@ pushd psa-crypto
cargo build --no-default-features
cargo build --no-default-features --features with-mbed-crypto
cargo build --no-default-features --features no-std

# Test dynamic linking
git clone https://github.com/ARMmbed/mbedtls.git
pushd mbedtls
git checkout mbedtls-2.22.0
./scripts/config.py crypto
SHARED=1 make
popd

# Build the driver, clean before to force dynamic linking
cargo clean
MBEDTLS_LIB_DIR=$(pwd)/mbedtls/library MBEDTLS_INCLUDE_DIR=$(pwd)/mbedtls/include cargo build --release
4 changes: 1 addition & 3 deletions psa-crypto-sys/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,4 @@ Linking and generating implementation-specific APIs is controlled by the
require only the spec-defined bits of the API (namely the constants and types)
you can simply disable default features.

Currently the version of MbedTLS built is based on the `development` branch
of their repository, as the Mbed Crypto functionality has not yet been included in
a standard release.
Currently the version of MbedTLS built is 2.22.0
2 changes: 1 addition & 1 deletion psa-crypto-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ pub use psa_crypto_binding::{
#[cfg(feature = "implementation-defined")]
pub use psa_crypto_binding::{
psa_drv_se_asymmetric_t, psa_drv_se_context_t, psa_drv_se_key_management_t, psa_drv_se_t,
psa_key_creation_method_t, psa_key_location_t, psa_key_persistence_t, psa_key_slot_number_t,
psa_key_creation_method_t, psa_key_slot_number_t,
};

#[cfg(feature = "implementation-defined")]
Expand Down
2 changes: 1 addition & 1 deletion psa-crypto-sys/vendor