Bump rust-sgx-sdk to master #1133
Conversation
There was a problem hiding this comment.
Nice, thanks a lot!
To me, this looks good except for the one duplicate dependency we have. Beware that the crypto helper is also used on the untrusted side, maybe this is where you have forgotten to change the dependency. But perhaps @haerdib can quickly confirm my judgement, as she did many of these updates.
enclave-runtime/Cargo.lock
Outdated
| @@ -1886,7 +1886,7 @@ dependencies = [ | |||
| "parity-scale-codec", | |||
| "serde 1.0.118 (git+https://github.com/mesalock-linux/serde-sgx?tag=sgx_1.1.3)", | |||
| "serde_json 1.0.60 (git+https://github.com/mesalock-linux/serde-json-sgx?tag=sgx_1.1.3)", | |||
| "sgx_crypto_helper", | |||
| "sgx_crypto_helper 1.1.6 (git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=master)", | |||
There was a problem hiding this comment.
When you suddenly have additional information in the dep here, it means that we have the dependency twice. So we are probably still referencing this crate from the v1.1.6-testing branch somewhere.
There was a problem hiding this comment.
Should be resolved now
enclave-runtime/Cargo.lock
Outdated
| source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=master#27bd225ae6dbcd1d0a6d4d9590acc4d73c5195c2" | ||
|
|
||
| [[package]] | ||
| name = "sgx_crypto_helper" | ||
| version = "1.1.6" | ||
| source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=master#27bd225ae6dbcd1d0a6d4d9590acc4d73c5195c2" | ||
| dependencies = [ | ||
| "itertools", | ||
| "serde 1.0.118 (git+https://github.com/mesalock-linux/serde-sgx)", | ||
| "serde-big-array", | ||
| "serde_derive 1.0.118", | ||
| "sgx_tcrypto", | ||
| "sgx_tstd", | ||
| "sgx_types", | ||
| ] |
There was a problem hiding this comment.
Yes, as you can see below, we still import the crypto helper from the testing branch too.
clangenb
added
A0-core
|
Good catch, thanks! 😂 Yes I missed |
This PR tries to switch the rust-sgx-sdk from branch
v1.1.6-testingtomasterso that it supports Intel SGX SDK 2.18.Steps done:
make -f UpdateRustSGXSDK.mkpin-sgxcargo updateFirst time bumping these versions, please let me know if I miss anything, thanks!