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.

Sign up for GitHub

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

Feat/hw accelerated sha updated #46

Merged
merged 4 commits into from
Nov 5, 2024
Merged

Feat/hw accelerated sha updated #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f09d2c
feat(SHA): Use hardware acceleration for SHA operations
AnthonyGrondin Aug 12, 2024
549269b
feat(SHA): Borrow the SHA peripheral instead of unsafely stealing
AnthonyGrondin Oct 15, 2024
dd06cb4
fix(init_ssl): Cleanup allocated resources on error to prevent a memo…
AnthonyGrondin Nov 4, 2024
4694d43
Use patched version of `edge-net` and `embassy-executor`
AnthonyGrondin Nov 4, 2024
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
13 changes: 9 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ esp-println = { version = "0.12.0", features = ["log"] }
esp-hal-embassy = { version = "0.4.0", optional = true }

embassy-time = { version = "0.3.0", optional = true }
embassy-executor = { version = "0.6.0", package = "embassy-executor", features = [
embassy-executor = { version = "=0.6.0", package = "embassy-executor", features = [
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can't we just use 0.6.1 and not patch the crate?

"nightly",
"integrated-timers",
], optional = true }
Expand Down Expand Up @@ -149,6 +149,11 @@ edge-server = [

# Patch until new release
[patch.crates-io]
edge-http = { git = "https://github.com/ivmarkov/edge-net", rev = "f90468953aec1d476ba52fe3b63f392a07bb9daa" }
edge-nal = { git = "https://github.com/ivmarkov/edge-net", rev = "f90468953aec1d476ba52fe3b63f392a07bb9daa" }
edge-nal-embassy = { git = "https://github.com/ivmarkov/edge-net", rev = "f90468953aec1d476ba52fe3b63f392a07bb9daa" }
edge-http = { git = "https://github.com/ivmarkov/edge-net", rev = "722f92ac0fffd0cb1e1ce76086cca58df6eb49ee" }
edge-nal = { git = "https://github.com/ivmarkov/edge-net", rev = "722f92ac0fffd0cb1e1ce76086cca58df6eb49ee" }
edge-nal-embassy = { git = "https://github.com/ivmarkov/edge-net", rev = "722f92ac0fffd0cb1e1ce76086cca58df6eb49ee" }

# Patch before 0.6.0 got yanked
embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "886580179ff250e15b0fad6448e8ebed6cdabf2b" }
embassy-time-driver = { git = "https://github.com/embassy-rs/embassy", rev = "886580179ff250e15b0fad6448e8ebed6cdabf2b" }
embassy-time-queue-driver = { git = "https://github.com/embassy-rs/embassy", rev = "886580179ff250e15b0fad6448e8ebed6cdabf2b" }
4 changes: 2 additions & 2 deletions esp-mbedtls-sys/headers/esp32/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,9 @@
//#define MBEDTLS_POLY1305_ALT
//#define MBEDTLS_RIPEMD160_ALT
//#define MBEDTLS_RSA_ALT
//#define MBEDTLS_SHA1_ALT
// #define MBEDTLS_SHA1_ALT
//#define MBEDTLS_SHA256_ALT
//#define MBEDTLS_SHA512_ALT
// #define MBEDTLS_SHA512_ALT

/*
* When replacing the elliptic curve module, please consider, that it is
Expand Down
2 changes: 1 addition & 1 deletion esp-mbedtls-sys/headers/esp32c3/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@
//#define MBEDTLS_POLY1305_ALT
//#define MBEDTLS_RIPEMD160_ALT
//#define MBEDTLS_RSA_ALT
//#define MBEDTLS_SHA1_ALT
#define MBEDTLS_SHA1_ALT
//#define MBEDTLS_SHA256_ALT
//#define MBEDTLS_SHA512_ALT

Expand Down
3 changes: 3 additions & 0 deletions esp-mbedtls-sys/headers/esp32c3/sha1_alt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
typedef struct mbedtls_sha1_context {
void* hasher;
} mbedtls_sha1_context;
6 changes: 3 additions & 3 deletions esp-mbedtls-sys/headers/esp32s2/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,9 @@
//#define MBEDTLS_POLY1305_ALT
//#define MBEDTLS_RIPEMD160_ALT
//#define MBEDTLS_RSA_ALT
//#define MBEDTLS_SHA1_ALT
//#define MBEDTLS_SHA256_ALT
//#define MBEDTLS_SHA512_ALT
#define MBEDTLS_SHA1_ALT
#define MBEDTLS_SHA256_ALT
#define MBEDTLS_SHA512_ALT

/*
* When replacing the elliptic curve module, please consider, that it is
Expand Down
3 changes: 3 additions & 0 deletions esp-mbedtls-sys/headers/esp32s2/sha1_alt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
typedef struct mbedtls_sha1_context {
void* hasher;
} mbedtls_sha1_context;
5 changes: 5 additions & 0 deletions esp-mbedtls-sys/headers/esp32s2/sha256_alt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
typedef struct mbedtls_sha256_context {
void* sha224_hasher;
void* sha256_hasher;
int is224;
} mbedtls_sha256_context;
5 changes: 5 additions & 0 deletions esp-mbedtls-sys/headers/esp32s2/sha512_alt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
typedef struct mbedtls_sha512_context {
void* sha384_hasher;
void* sha512_hasher;
int is384;
} mbedtls_sha512_context;
6 changes: 3 additions & 3 deletions esp-mbedtls-sys/headers/esp32s3/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,9 @@
//#define MBEDTLS_POLY1305_ALT
//#define MBEDTLS_RIPEMD160_ALT
//#define MBEDTLS_RSA_ALT
//#define MBEDTLS_SHA1_ALT
//#define MBEDTLS_SHA256_ALT
//#define MBEDTLS_SHA512_ALT
#define MBEDTLS_SHA1_ALT
#define MBEDTLS_SHA256_ALT
#define MBEDTLS_SHA512_ALT

/*
* When replacing the elliptic curve module, please consider, that it is
Expand Down
3 changes: 3 additions & 0 deletions esp-mbedtls-sys/headers/esp32s3/sha1_alt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
typedef struct mbedtls_sha1_context {
void* hasher;
} mbedtls_sha1_context;
5 changes: 5 additions & 0 deletions esp-mbedtls-sys/headers/esp32s3/sha256_alt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
typedef struct mbedtls_sha256_context {
void* sha224_hasher;
void* sha256_hasher;
int is224;
} mbedtls_sha256_context;
5 changes: 5 additions & 0 deletions esp-mbedtls-sys/headers/esp32s3/sha512_alt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
typedef struct mbedtls_sha512_context {
void* sha384_hasher;
void* sha512_hasher;
int is384;
} mbedtls_sha512_context;
Loading
Loading