Skip to content

Commit 9c51642

Browse files
authored
Merge pull request #14 from chrysn-pull-requests/v302
Update nrfxlib to 3.0.2
2 parents aa245e1 + 4d9e57f commit 9c51642

File tree

5 files changed

+19
-12
lines changed

5 files changed

+19
-12
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "nrfxlib-sys"
3-
version = "2.9.2"
3+
version = "3.0.2"
44
authors = [
55
"Jonathan 'theJPster' Pallant <[email protected]>",
66
"42 Technology Ltd <[email protected]>",

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ In your own program or library, you can depend on this crate in the usual fashio
3131
```toml
3232
[dependencies]
3333
# A chip feature must be selected
34-
nrfxlib-sys = { version = "=2.9.1", features = ["nrf9160"] }
34+
nrfxlib-sys = { version = "=3.0.2", features = ["nrf9160"] }
3535
```
3636

3737
Because the modem library has its debug sections compressed and Rust's tooling doesn't have support for
@@ -74,6 +74,8 @@ without any additional terms or conditions.
7474

7575
### Unreleased Changes ([Source](https://github.com/nrf-rs/nrfxlib-sys/tree/develop) | [Changes](https://github.com/nrf-rs/nrfxlib-sys/compare/v2.9.2...develop))
7676

77+
* Updated to [nrfxlib v3.0.2](https://github.com/NordicPlayground/nrfxlib/tree/v3.0.2)
78+
7779
### v2.9.2 ([Source](https://github.com/nrf-rs/nrfxlib-sys/tree/v2.9.2) | [Changes](https://github.com/nrf-rs/nrfxlib-sys/compare/v2.9.1...v2.9.2))
7880

7981
* Disabled bindgen layout tests so this crate can be built for desktops

build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,6 @@ fn main() {
173173
.display()
174174
);
175175
println!("cargo:rustc-link-lib=static=modem");
176-
println!("cargo:rustc-link-lib=static=oberon_3.0.15");
176+
println!("cargo:rustc-link-lib=static=oberon_3.0.16");
177177
println!("cargo:rustc-link-lib=static=nrf_cc310_platform_0.9.19");
178178
}

third_party/nordic/nrfxlib

Submodule nrfxlib updated 983 files

wrapper.h

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,35 +35,40 @@
3535
*/
3636

3737
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/aes_alt.h"
38+
/* #include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/cc3xx_kmu.h" depends on mbedtls/config.h */
39+
/* #include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/ccm_alt.h" depends on config cipher.h */
3840
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/chacha20_alt.h"
3941
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/chachapoly_alt.h"
4042
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/cmac_alt.h"
4143
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/dhm_alt.h"
4244
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/ecp_alt.h"
43-
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/platform_alt.h"
44-
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/poly1305_alt.h"
45-
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/rsa_alt.h"
46-
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/sha1_alt.h"
47-
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/sha256_alt.h"
48-
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/threading_alt.h"
4945
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_aes_defs.h"
5046
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_aes_defs_proj.h"
5147
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_bitops.h"
48+
/* #include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_ecpki_types.h" depends on config cc_pka_hw_plat_defs.h via cc_pka_defs_hw.h */
5249
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_error.h"
5350
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_hash_defs.h"
5451
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_hash_defs_proj.h"
5552
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_kdf.h"
5653
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_pal_compiler.h"
5754
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_pal_types.h"
5855
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_pal_types_plat.h"
56+
/* #include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_pka_defs_hw.h" depends on config cc_pka_hw_plat_defs.h */
5957
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_rnd_common.h"
6058
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/cc_rnd_error.h"
61-
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/mbedtls_cc_aes_key_wrap.h"
6259
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/mbedtls_cc_aes_key_wrap_error.h"
60+
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/mbedtls_cc_aes_key_wrap.h"
61+
/* #include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/mbedtls_cc_ecies.h" depends on config cc_pka_hw_plat_defs.h via cc_pka_defs_hw.h */
6362
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/mbedtls_cc_ec_mont_edw_error.h"
64-
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/mbedtls_cc_hkdf.h"
6563
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/mbedtls_cc_hkdf_error.h"
64+
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/mbedtls_cc_hkdf.h"
6665
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/mbedtls_cc_srp_error.h"
66+
/* #include "crypto/nrf_cc310_mbedcrypto/include/mbedtls_extra/mbedtls_cc_srp.h" depends on config cc_pka_hw_plat_defs.h via cc_pka_defs_hw.h */
67+
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/platform_alt.h"
68+
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/poly1305_alt.h"
69+
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/rsa_alt.h"
70+
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/sha1_alt.h"
71+
#include "crypto/nrf_cc310_mbedcrypto/include/mbedtls/sha256_alt.h"
6772

6873
/*
6974
* In addition to CC310 acceleration for mbedTLS, this repository also appears

0 commit comments

Comments
 (0)