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

Jump to bottom

Fix em_app vulnerability #554

Merged
merged 2 commits into from
Jan 16, 2024
Merged

Fix em_app vulnerability #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a363435
Remove `encrypt_buffer` and `decrypt_buffer` functions from API
raoulstrackx Jan 16, 2024
7c46bec
Bump `em-app` version
raoulstrackx Jan 16, 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
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ jobs:
ln -sf /usr/include/x86_64-linux-gnu/openssl /tmp/muslinclude/openssl
PKG_CONFIG_ALLOW_CROSS=1 CFLAGS=-I/tmp/muslinclude CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=true cargo build --locked -p fortanix-sgx-tools --target x86_64-unknown-linux-musl

- name: Build em-app, get-certificate, harmonize for x86_64-unknown-linux-musl
run: cargo build --verbose --locked -p em-app -p get-certificate -p harmonize --target=x86_64-unknown-linux-musl
- name: Build em-app, get-certificate for x86_64-unknown-linux-musl
run: cargo build --verbose --locked -p em-app -p get-certificate --target=x86_64-unknown-linux-musl

- name: Build em-app, get-certificate, harmonize for x86_64-fortanix-unknown-sgx
run: cargo build --verbose --locked -p em-app -p get-certificate -p harmonize --target=x86_64-fortanix-unknown-sgx
- name: Build em-app, get-certificate for x86_64-fortanix-unknown-sgx
run: cargo build --verbose --locked -p em-app -p get-certificate --target=x86_64-fortanix-unknown-sgx

- name: Generate API docs
run: ./doc/generate-api-docs.sh
Expand Down
61 changes: 1 addition & 60 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ members = [
"rs-libc",
"em-app",
"em-app/examples/get-certificate/",
"em-app/examples/harmonize/",
]
exclude = ["examples"]

Expand Down
2 changes: 1 addition & 1 deletion em-app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "em-app"
version = "0.4.0"
version = "0.5.0"
authors = ["fortanix.com"]
license = "MPL-2.0"
edition = "2018"
Expand Down
22 changes: 0 additions & 22 deletions em-app/examples/harmonize/Cargo.toml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions em-app/examples/harmonize/README.md
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions em-app/examples/harmonize/certs/aws_s3.pem
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions em-app/examples/harmonize/certs/em_ca_cert.pem
View file
Open in desktop

This file was deleted.

179 changes: 0 additions & 179 deletions em-app/examples/harmonize/src/main.rs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion em-app/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#[macro_use]
pub extern crate serde_derive;

pub mod mbedtls_hyper;
Expand Down
Loading