add build dependence path for td migration build #130
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jinghe-INTC
approved these changes
Jun 28, 2022
lzha101
reviewed
Jun 29, 2022
Linux/sgx/test_app/sgx_u.mk
Outdated
| include ../../../../../QuoteGeneration/buildenv.mk | ||
| SGX_EDGER8R := $(TD_MIGRATION_STD_LIB_PATH)/sgx_edger8r | ||
| SGX_SDK_INC := $(TD_MIGRATION_STD_INC_PATH) | ||
| LIBCXX_INC := $(TD_MIGRATION_LINUX_TRUNK_ROOT_PATH)/sdk/tlibcxx/include |
There was a problem hiding this comment.
This line could be removed as this is for untrusted part.
lzha101
approved these changes
Jun 29, 2022
jinghe-INTC
pushed a commit
that referenced
this pull request
Sep 22, 2022
* update architecture doc (#115) Signed-off-by: Jing He <jing.j.he@intel.com> * Linux: small fixes (#111) * Linux: fix Nix detection Detect the `OS_ID` of Nix by probing for the presence of the `NIX_STORE` environment variable instead of `NIX_PATH`. The latter is only set in a `nix-shell` session but isn't when building a derivation through `nix-build`. In contrast, the `NIX_STORE` environment variable is set in both cases. Signed-off-by: Vincent Haupert <mail@vincent-haupert.de> * Linux: call binaries relative to PATH Using an absolute path to call binaries is incompatible with distributions which do not follow the Filesystem Hierachy Standard; Nix is an example. Also, it is inconsistent with the rest of the code base, let alone superfluous. Signed-off-by: Vincent Haupert <mail@vincent-haupert.de> * Linux: properly extract GCC major version Calling `gcc -dumpversion` yields the full version string, e.g., `10.3.0`. The `build_openssl.sh` bash script uses the `-ge` number comparison operator to check if the returned version is at least 8. This results in an error if the returned GCC version includes a patch version; "10.3.0" isn't a valid number. This commit fixes the version detection by only extracting the relevant major version of GCC. Signed-off-by: Vincent Haupert <mail@vincent-haupert.de> * add an option to make it possible to build on non-intel platform (#116) * add a built flag "SKIP_INTELCPU_CHECK" for non-intel platform, ref #113 * Update README.md Signed-off-by: Jing He <jing.j.he@intel.com> * Update build script (#119) * update build scripts, removing OPENSSL_INSTALL_DIR * update tsgxssl file to remove full path Signed-off-by: Jing He <jing.j.he@intel.com> * Upgrade to take OpenSSL 1.1.1n (#120) * Fix windows tsgxssl code (#122) * use the _t.h of the generated version instead of the saved one Signed-off-by: Jing He <jing.j.he@intel.com> * fix the last file Signed-off-by: Jing He <jing.j.he@intel.com> * remove unnecessary including of sgx_trts.h Signed-off-by: Jing He <jing.j.he@intel.com> * correct the tcommon.h file name Signed-off-by: Jing He <jing.j.he@intel.com> * upgrade to OpenSSL 1.1.1o (#124) * add build dependence path for td migration build (#130) * add build dependence path for td migration build * revert untrusted part changes, since only need trusted part * Upgrade for OpenSSL 1.1.1p (#131) * upgrade for openssl 1.1.1p Signed-off-by: Jing He <jing.j.he@intel.com> * generated by: $ diff ../openssl_source/openssl-1.1.1p/crypto/bn/x86_64-mont5.s ../openssl_source/openssl-1.1.1o/crypto/bn/x86_64-mont5.s Signed-off-by: Jing He <jing.j.he@intel.com> * generated by: (WSL) $ diff ../openssl_source/openssl-1.1.1p/crypto/bn/x86_64-mont5.asm ../openssl_source/openssl-1.1.1o/crypto/bn/x86_64-mont5.asm Signed-off-by: Jing He <jing.j.he@intel.com> * upgrade for openssl 1.1.1p Signed-off-by: Jing He <jing.j.he@intel.com> * correct the result of tool.txt (#117) Signed-off-by: Jing He <jing.j.he@intel.com> * update for OpenSSL upgrading to 1.1.1q (#132) * update for OpenSSL upgrading to 1.1.1q Signed-off-by: Jing He <jing.j.he@intel.com> * update Signed-off-by: Jing He <jing.j.he@intel.com> * Directly use the macro value instead of including a header file. (#136) Signed-off-by: Zhang, Lili Z <lili.z.zhang@intel.com> Signed-off-by: Zhang, Lili Z <lili.z.zhang@intel.com> Signed-off-by: Jing He <jing.j.he@intel.com> Signed-off-by: Vincent Haupert <mail@vincent-haupert.de> Signed-off-by: Zhang, Lili Z <lili.z.zhang@intel.com> Co-authored-by: jinghe-INTC <jing.j.he@intel.com> Co-authored-by: Vincent Haupert <mail@vincent-haupert.de> Co-authored-by: dashuaic <dashuai.cheng@intel.com> Co-authored-by: lzha101 <lili.z.zhang@intel.com>
jinghe-INTC
pushed a commit
that referenced
this pull request
Mar 2, 2023
* update architecture doc (#115) Signed-off-by: Jing He <jing.j.he@intel.com> * Linux: small fixes (#111) * Linux: fix Nix detection Detect the `OS_ID` of Nix by probing for the presence of the `NIX_STORE` environment variable instead of `NIX_PATH`. The latter is only set in a `nix-shell` session but isn't when building a derivation through `nix-build`. In contrast, the `NIX_STORE` environment variable is set in both cases. Signed-off-by: Vincent Haupert <mail@vincent-haupert.de> * Linux: call binaries relative to PATH Using an absolute path to call binaries is incompatible with distributions which do not follow the Filesystem Hierachy Standard; Nix is an example. Also, it is inconsistent with the rest of the code base, let alone superfluous. Signed-off-by: Vincent Haupert <mail@vincent-haupert.de> * Linux: properly extract GCC major version Calling `gcc -dumpversion` yields the full version string, e.g., `10.3.0`. The `build_openssl.sh` bash script uses the `-ge` number comparison operator to check if the returned version is at least 8. This results in an error if the returned GCC version includes a patch version; "10.3.0" isn't a valid number. This commit fixes the version detection by only extracting the relevant major version of GCC. Signed-off-by: Vincent Haupert <mail@vincent-haupert.de> * add an option to make it possible to build on non-intel platform (#116) * add a built flag "SKIP_INTELCPU_CHECK" for non-intel platform, ref #113 * Update README.md Signed-off-by: Jing He <jing.j.he@intel.com> * Update build script (#119) * update build scripts, removing OPENSSL_INSTALL_DIR * update tsgxssl file to remove full path Signed-off-by: Jing He <jing.j.he@intel.com> * Upgrade to take OpenSSL 1.1.1n (#120) * Fix windows tsgxssl code (#122) * use the _t.h of the generated version instead of the saved one Signed-off-by: Jing He <jing.j.he@intel.com> * fix the last file Signed-off-by: Jing He <jing.j.he@intel.com> * remove unnecessary including of sgx_trts.h Signed-off-by: Jing He <jing.j.he@intel.com> * correct the tcommon.h file name Signed-off-by: Jing He <jing.j.he@intel.com> * upgrade to OpenSSL 1.1.1o (#124) * add build dependence path for td migration build (#130) * add build dependence path for td migration build * revert untrusted part changes, since only need trusted part * Upgrade for OpenSSL 1.1.1p (#131) * upgrade for openssl 1.1.1p Signed-off-by: Jing He <jing.j.he@intel.com> * generated by: $ diff ../openssl_source/openssl-1.1.1p/crypto/bn/x86_64-mont5.s ../openssl_source/openssl-1.1.1o/crypto/bn/x86_64-mont5.s Signed-off-by: Jing He <jing.j.he@intel.com> * generated by: (WSL) $ diff ../openssl_source/openssl-1.1.1p/crypto/bn/x86_64-mont5.asm ../openssl_source/openssl-1.1.1o/crypto/bn/x86_64-mont5.asm Signed-off-by: Jing He <jing.j.he@intel.com> * upgrade for openssl 1.1.1p Signed-off-by: Jing He <jing.j.he@intel.com> * correct the result of tool.txt (#117) Signed-off-by: Jing He <jing.j.he@intel.com> * update for OpenSSL upgrading to 1.1.1q (#132) * update for OpenSSL upgrading to 1.1.1q Signed-off-by: Jing He <jing.j.he@intel.com> * update Signed-off-by: Jing He <jing.j.he@intel.com> * Directly use the macro value instead of including a header file. (#136) Signed-off-by: Zhang, Lili Z <lili.z.zhang@intel.com> Signed-off-by: Zhang, Lili Z <lili.z.zhang@intel.com> * Remove the permission modification line in Makefile. Signed-off-by: Zhang, Lili Z <lili.z.zhang@intel.com> * Update unit test code (#141) * update unit test code: keygen test of RSA and EC * update project settings * update Windows test code Signed-off-by: Jing He <jing.j.he@intel.com> * *upgrade for openssl 1.1.1s (#139) *upgrade for openssl 1.1.1s *update unit test sample with generated key file Signed-off-by: Jing He <jing.j.he@intel.com> * enhance security of the test app (#145) Signed-off-by: Jing He <jing.j.he@intel.com> * Upgrade 1.1.1t (#150) * upgrade to 1.1.1t Signed-off-by: Jing He <jing.j.he@intel.com> * update version --------- Signed-off-by: Jing He <jing.j.he@intel.com> Signed-off-by: Vincent Haupert <mail@vincent-haupert.de> Signed-off-by: Zhang, Lili Z <lili.z.zhang@intel.com> Co-authored-by: jinghe-INTC <jing.j.he@intel.com> Co-authored-by: Vincent Haupert <mail@vincent-haupert.de> Co-authored-by: dashuaic <dashuai.cheng@intel.com> Co-authored-by: lzha101 <lili.z.zhang@intel.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.