Skip to content

Commit

Permalink
remove pe2sgxs
Browse files Browse the repository at this point in the history
- remove CI for pe2sgxs
- update `sgxs-tools` 's README
- move `isgx-pe2sgx.rs` to deprecated folder
- remove `sgxs-tools` 's feature `pe2sgxs` and related dependencies
  • Loading branch information
Taowyoo committed May 4, 2023
1 parent 0403768 commit 533914b
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 51 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ matrix:
- rustup target add x86_64-fortanix-unknown-sgx --toolchain nightly
script:
- cargo test --verbose --locked --all --exclude sgxs-loaders && [ "$(echo $(nm -D target/debug/sgx-detect|grep __vdso_sgx_enter_enclave))" = "w __vdso_sgx_enter_enclave" ]
- cargo test --verbose --locked -p sgxs-tools --features pe2sgxs --bin isgx-pe2sgx
- cargo test --verbose --locked -p dcap-ql --features link
- cargo test --verbose --locked -p dcap-ql --features verify
- cargo test --verbose --locked -p ias --features mbedtls
Expand Down
61 changes: 19 additions & 42 deletions Cargo.lock

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

7 changes: 0 additions & 7 deletions intel-sgx/sgxs-tools/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ autobins = true
proc-macro = true
path = "src/sgx_detect/proc_macro.rs"

[[bin]]
name = "isgx-pe2sgx"
required-features = ["pe2sgxs"]

[[bin]]
name = "sgx-detect"
path = "src/sgx_detect/main.rs"
Expand All @@ -47,7 +43,6 @@ openssl = "0.10" # Apache-2.0
failure = "0.1.1" # MIT/Apache-2.0
failure_derive = "0.1.1" # MIT/Apache-2.0
crypto-hash = "0.3" # MIT
broadcast = { version = "0.1", optional = true } # MIT
log = "0.4" # MIT/Apache-2.0
env_logger = "0.6" # MIT/Apache-2.0
yansi = "0.5" # MIT/Apache-2.0
Expand All @@ -62,7 +57,6 @@ proc-mounts = "0.2.4" # MIT
serde = "1.0.84" # MIT/Apache-2.0
serde_derive = "1.0.84" # MIT/Apache-2.0
serde_yaml = "0.8.8" # MIT/Apache-2.0
pe = { version = "0.1", optional = true } # GPL

[target.'cfg(unix)'.dependencies]
"dcap-ql" = { version = "0.3.0", path = "../dcap-ql" }
Expand All @@ -71,7 +65,6 @@ pe = { version = "0.1", optional = true } # GPL
winapi = { version = "0.3.7", features = ["winbase"] }

[features]
pe2sgxs = ["pe", "broadcast"]
docs = []

[package.metadata.docs.rs]
Expand Down
6 changes: 5 additions & 1 deletion intel-sgx/sgxs-tools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@

Compiles with Rust nightly.

## pe2sgxs
## pe2sgxs (deprecated since v0.8.7)

`pe2sgxs` converts enclaves in Intel's PE format to SGXS format, optionally
extracting the signature. You can then use the SGXS file with the other SGXS
utilities.

This is deprecated since v0.8.7 because the code of its dependency `pe` is
incompatible with rust compiler since `nightly-2023-01-31`. The source code has
been moved to `src/deprecated`.

## sgx-debug-read

`sgx-debug-read` tries to read memory in the EPC. This will only succeed for
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
* 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/. */

//! This code is deprecated since v0.8.7 because its dependency `pe`
//! is incompatible with rust compiler since `nightly-2023-01-31`.
#[macro_use]
extern crate lazy_static;
extern crate broadcast;
Expand Down Expand Up @@ -614,6 +617,9 @@ [email protected] with as much data as you can provide about the enclave."
)
}

#[deprecated(since = "0.8.7")]
/// The dependency `pe` of this part of code is incompatible with rust compiler
/// since `nightly-2023-01-31`."
fn main() {
let mut args = std::env::args_os();
let _name = args.next();
Expand Down

0 comments on commit 533914b

Please sign in to comment.