provide settings configuration to set config_id/config_svn on ice lake platform enclaves #3799

manojrupireddy · 2021-01-14T00:12:39Z

This is in continuation to the work done by Alvin => #3735.
Made changes to the above draft PR , based on the code review comments there.
Signed-off-by: manoj rupireddy marupire@microsoft.com

CodeMonkeyLeet

Thanks for taking the old PR forwards! See comments for suggestions and concerns.

include/openenclave/host.h

host/sgx/create.c

mingweishih · 2021-01-15T22:57:46Z

include/openenclave/host.h

+ */
+typedef struct _oe_enclave_setting_config_data
+{
+    uint8_t enclave_config_id[64];


According to the spec and #3054, the config id should be 32 bytes. Could you double check?

Suggested change

uint8_t enclave_config_id[64];

uint8_t config_id[32];

Add @bodzhang

Hi @bodzhang , Can you confirm if this is the right data structure to use for SECS data structure.
I am planning to replicate the below intels secs_t structure in OE codebase and in intel codebase config_id is allocated 64 bytes. https://github.com/intel/linux-sgx/blob/d3bd1571240bcdf85734c232a4f0c86828443ebb/common/inc/internal/arch.h#L59

There seem to be an inconsistent in the Intel manual. According to the table 37-2 (secs) and 37-23 (report), the configid field should be 64 bytes. However, the text in 38.4.1.3 mentions that "enclave is created the platform can additionally provide 32-byte configuration identifier (CONFIGID).". I think it should be fine to keep 64 bytes for now.

include/openenclave/host.h

include/openenclave/internal/sgxcreate.h

mingweishih · 2021-01-15T23:20:54Z

include/openenclave/bits/sgx/sgxtypes.h

@@ -292,7 +292,10 @@ typedef struct _sgx_secs
    uint8_t reserved3[96];  /* 160 */
    uint16_t isvvprodid;    /* 256 */
    uint16_t isvsvn;        /* 258 */
-    uint8_t reserved[3836]; /* 260 */
+    uint8_t reserved4[20];  /* 260 */
+    uint8_t config_id[64];  /* 280 */


Please check if this is 32 or 64 bytes.

include/openenclave/host.h

host/sgx/create.c

mingweishih

LGTM! Thanks for addressing all the feedbacks.

tests/CMakeLists.txt

tests/icelake_config_id/enc/enc.cpp

tests/icelake_config_id/enc/CMakeLists.txt

tests/icelake_config_id/icelake_config_id.edl

tests/icelake_config_id/host/host.cpp

mingweishih · 2021-02-10T20:20:29Z

bors r+

3799: provide settings configuration to set config_id/config_svn on ice lake platform enclaves r=mingweishih a=manojrupireddy This is in continuation to the work done by Alvin => #3735. Made changes to the above draft PR , based on the code review comments there. Signed-off-by: manoj rupireddy <marupire@microsoft.com> Co-authored-by: manoj rupireddy <marupire@microsoft.com>

bors · 2021-02-10T22:00:09Z

Build failed:

continuous-integration/jenkins/branch

manojrupireddy · 2021-02-10T23:47:33Z

bors r+

bors · 2021-02-10T23:47:34Z

🔒 Permission denied

Existing reviewers: click here to make manojrupireddy a reviewer

mingweishih · 2021-02-10T23:48:55Z

bors r+

3799: provide settings configuration to set config_id/config_svn on ice lake platform enclaves r=mingweishih a=manojrupireddy This is in continuation to the work done by Alvin => #3735. Made changes to the above draft PR , based on the code review comments there. Signed-off-by: manoj rupireddy <marupire@microsoft.com> Co-authored-by: manoj rupireddy <marupire@microsoft.com>

bors · 2021-02-11T01:28:59Z

Build failed:

continuous-integration/jenkins/branch

mingweishih · 2021-02-11T01:46:25Z

bors delegate+

bors · 2021-02-11T01:46:26Z

✌️ manojrupireddy can now approve this pull request. To approve and merge a pull request, simply reply with bors r+. More detailed instructions are available here.

…e platform enclaves Signed-off-by: manoj rupireddy <marupire@microsoft.com>

manojrupireddy · 2021-02-11T20:21:48Z

bors r+

3799: provide settings configuration to set config_id/config_svn on ice lake platform enclaves r=manojrupireddy a=manojrupireddy This is in continuation to the work done by Alvin => #3735. Made changes to the above draft PR , based on the code review comments there. Signed-off-by: manoj rupireddy <marupire@microsoft.com> Co-authored-by: manoj rupireddy <marupire@microsoft.com>

bors · 2021-02-11T21:27:28Z

Build failed:

continuous-integration/jenkins/branch

manojrupireddy · 2021-02-11T21:35:32Z

bors r+

3799: provide settings configuration to set config_id/config_svn on ice lake platform enclaves r=manojrupireddy a=manojrupireddy This is in continuation to the work done by Alvin => #3735. Made changes to the above draft PR , based on the code review comments there. Signed-off-by: manoj rupireddy <marupire@microsoft.com> 3826: replacing constant salt with per-file random salt r=mingweishih a=RRathna replacing constant salt, and generating it randomly per file to be encrypted. Fixes #3692 3831: Update the oeedger8r submodule r=mingweishih a=mingweishih This PR sync up the oeedger8r against the master branch, which introduces the following changes: - Enforce the safe multiplication (see the [PR](openenclave/oeedger8r-cpp#31)). Fix #2390 - Add checks against pointer array arguments (see the [PR](openenclave/oeedger8r-cpp#65)). Fix #3557 - Make the oeedger8r-generated variables conform OE guidelines (see the [PR](openenclave/oeedger8r-cpp#66)). Fix #3210 - Add new warning options for the non-serializable cases (see the [PR](openenclave/oeedger8r-cpp#67)). Fix #3513 Co-authored-by: manoj rupireddy <marupire@microsoft.com> Co-authored-by: rrathna <rathna1993@gmail.com> Co-authored-by: Ming-Wei Shih <mishih@microsoft.com>

bors · 2021-02-11T23:08:45Z

This PR was included in a batch that was canceled, it will be automatically retried

mingweishih · 2021-02-12T00:05:08Z

bors r-

bors · 2021-02-12T00:05:09Z

Canceled.

mingweishih · 2021-02-12T00:05:22Z

bors r+

3799: provide settings configuration to set config_id/config_svn on ice lake platform enclaves r=mingweishih a=manojrupireddy This is in continuation to the work done by Alvin => #3735. Made changes to the above draft PR , based on the code review comments there. Signed-off-by: manoj rupireddy <marupire@microsoft.com> 3824: Avoid recompiling common files for each ssl test r=mingweishih a=anakrish This reduces the number of files being compiled and also allows cmake to parallelize builds better. Most dev machines should see some drop in build times. E.g: In my machine, tests/openssl build time drops from 192 secs to 90 secs. Signed-off-by: Anand Krishnamoorthi <anakrish@microsoft.com> 3826: replacing constant salt with per-file random salt r=mingweishih a=RRathna replacing constant salt, and generating it randomly per file to be encrypted. Fixes #3692 Co-authored-by: manoj rupireddy <marupire@microsoft.com> Co-authored-by: Anand Krishnamoorthi <anakrish@microsoft.com> Co-authored-by: rrathna <rathna1993@gmail.com>

bors · 2021-02-12T01:14:33Z

Build failed (retrying...):

continuous-integration/jenkins/branch

bors · 2021-02-12T02:57:31Z

Build succeeded:

continuous-integration/jenkins/branch

manojrupireddy requested review from achamayou, CodeMonkeyLeet, dthaler, gupta-ak and mikbras as code owners January 14, 2021 00:12

radhikaj requested review from nonpolarity, jianlia, mingweishih and bodzhang and removed request for achamayou and mikbras January 14, 2021 00:14

CodeMonkeyLeet reviewed Jan 14, 2021

View reviewed changes

mingweishih reviewed Jan 15, 2021

View reviewed changes

mingweishih mentioned this pull request Jan 19, 2021

Add basic support of config_id/config_svn on Ice Lake platform. #3735

Closed

dthaler reviewed Jan 19, 2021

View reviewed changes

include/openenclave/host.h Outdated Show resolved Hide resolved

manojrupireddy force-pushed the icelake_modifications branch from f4e30fe to 620c5fe Compare January 25, 2021 05:38

manojrupireddy commented Jan 25, 2021

View reviewed changes

host/sgx/create.c Outdated Show resolved Hide resolved

manojrupireddy force-pushed the icelake_modifications branch from 620c5fe to 4087b55 Compare January 25, 2021 05:46

radhikaj added this to the v0.14 milestone Jan 25, 2021

radhikaj added this to InProgress in v0.14 Jan 25, 2021

manojrupireddy force-pushed the icelake_modifications branch from 4087b55 to 04db2e1 Compare January 25, 2021 20:56

mingweishih approved these changes Jan 25, 2021

View reviewed changes

CodeMonkeyLeet approved these changes Jan 25, 2021

View reviewed changes

manojrupireddy force-pushed the icelake_modifications branch from 04db2e1 to 88fbafb Compare February 8, 2021 17:28

manojrupireddy requested review from andyleejordan, BRMcLaren and radhikaj as code owners February 8, 2021 17:28

mingweishih reviewed Feb 8, 2021

View reviewed changes

manojrupireddy force-pushed the icelake_modifications branch from 88fbafb to 37d8932 Compare February 10, 2021 20:16

manojrupireddy force-pushed the icelake_modifications branch from 37d8932 to 039f5e6 Compare February 10, 2021 23:47

provide settings configuration to set config_id/config_svn on ice lak…

1dcccd7

…e platform enclaves Signed-off-by: manoj rupireddy <marupire@microsoft.com>

manojrupireddy force-pushed the icelake_modifications branch from 039f5e6 to 1dcccd7 Compare February 11, 2021 20:21

bors bot merged commit 8d5b23f into openenclave:master Feb 12, 2021

yentsanglee mentioned this pull request Mar 17, 2021

Add test for verifying new fields in sgx_report_body_t struct #3890

Closed

radhikaj mentioned this pull request Mar 23, 2021

SGX: Enable basic Key Separation and Sharing Support #3054

Closed

yentsanglee mentioned this pull request Mar 23, 2021

Add test for verifying enclave config_id/config_svn fields in evidence claims for SGX #3903

Closed

radhikaj moved this from InProgress to Done in v0.14 May 26, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

provide settings configuration to set config_id/config_svn on ice lake platform enclaves #3799

provide settings configuration to set config_id/config_svn on ice lake platform enclaves #3799

manojrupireddy commented Jan 14, 2021 •

edited by mingweishih

Loading

CodeMonkeyLeet left a comment

mingweishih Jan 15, 2021

mingweishih Jan 15, 2021

mingweishih Jan 15, 2021

manojrupireddy Jan 19, 2021 •

edited

Loading

mingweishih Jan 19, 2021

mingweishih Jan 15, 2021

mingweishih left a comment

mingweishih commented Feb 10, 2021

bors bot commented Feb 10, 2021

manojrupireddy commented Feb 10, 2021

bors bot commented Feb 10, 2021

mingweishih commented Feb 10, 2021

bors bot commented Feb 11, 2021

mingweishih commented Feb 11, 2021

bors bot commented Feb 11, 2021

manojrupireddy commented Feb 11, 2021

bors bot commented Feb 11, 2021

manojrupireddy commented Feb 11, 2021

bors bot commented Feb 11, 2021

mingweishih commented Feb 12, 2021

bors bot commented Feb 12, 2021

mingweishih commented Feb 12, 2021

bors bot commented Feb 12, 2021

bors bot commented Feb 12, 2021

provide settings configuration to set config_id/config_svn on ice lake platform enclaves #3799

provide settings configuration to set config_id/config_svn on ice lake platform enclaves #3799

Conversation

manojrupireddy commented Jan 14, 2021 • edited by mingweishih Loading

CodeMonkeyLeet left a comment

Choose a reason for hiding this comment

mingweishih Jan 15, 2021

Choose a reason for hiding this comment

mingweishih Jan 15, 2021

Choose a reason for hiding this comment

mingweishih Jan 15, 2021

Choose a reason for hiding this comment

manojrupireddy Jan 19, 2021 • edited Loading

Choose a reason for hiding this comment

mingweishih Jan 19, 2021

Choose a reason for hiding this comment

mingweishih Jan 15, 2021

Choose a reason for hiding this comment

mingweishih left a comment

Choose a reason for hiding this comment

mingweishih commented Feb 10, 2021

bors bot commented Feb 10, 2021

manojrupireddy commented Feb 10, 2021

bors bot commented Feb 10, 2021

mingweishih commented Feb 10, 2021

bors bot commented Feb 11, 2021

mingweishih commented Feb 11, 2021

bors bot commented Feb 11, 2021

manojrupireddy commented Feb 11, 2021

bors bot commented Feb 11, 2021

manojrupireddy commented Feb 11, 2021

bors bot commented Feb 11, 2021

mingweishih commented Feb 12, 2021

bors bot commented Feb 12, 2021

mingweishih commented Feb 12, 2021

bors bot commented Feb 12, 2021

bors bot commented Feb 12, 2021

manojrupireddy commented Jan 14, 2021 •

edited by mingweishih

Loading

manojrupireddy Jan 19, 2021 •

edited

Loading