Merge pull request fortanix#554 from fortanix/raoul/fortanixgh-553-fi…

…x_em_app_vulnerability Fix `em_app` vulnerability
vn971 · Jan 16, 2024 · 8b187bd · 8b187bd
2 parents 5ef6bf7 + 7c46bec
commit 8b187bd
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 378 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,7 +30,6 @@ members = [
     "rs-libc",
     "em-app",
     "em-app/examples/get-certificate/",
-    "em-app/examples/harmonize/",
 ]
 exclude = ["examples"]
 

diff --git a/em-app/Cargo.toml b/em-app/Cargo.toml
@@ -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"

diff --git a/em-app/examples/harmonize/Cargo.toml b/em-app/examples/harmonize/Cargo.toml
diff --git a/em-app/examples/harmonize/README.md b/em-app/examples/harmonize/README.md
diff --git a/em-app/examples/harmonize/certs/aws_s3.pem b/em-app/examples/harmonize/certs/aws_s3.pem
diff --git a/em-app/examples/harmonize/certs/em_ca_cert.pem b/em-app/examples/harmonize/certs/em_ca_cert.pem
diff --git a/em-app/examples/harmonize/src/main.rs b/em-app/examples/harmonize/src/main.rs
diff --git a/em-app/src/lib.rs b/em-app/src/lib.rs
@@ -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;