Skip to content

Commit

Permalink
udpate action scripts for OpenSSL 3.0.14 (#221)
Browse files Browse the repository at this point in the history
And necessary fixes.

Signed-off-by: He, Jing J <jing.j.he@intel.com>
  • Loading branch information
jinghe-INTC authored Jun 12, 2024
1 parent f28cd30 commit 790658c
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: install SDK
run: chmod +x *.bin; echo yes | ./sgx_linux_x64_sdk_2.*.bin
- name: download OpenSSL code
run: wget https://www.openssl.org/source/openssl-3.0.13.tar.gz --directory-prefix=openssl_source/
run: wget https://www.openssl.org/source/openssl-3.0.14.tar.gz --directory-prefix=openssl_source/
- name: build SGXSSL
run: source sgxsdk/environment; cd Linux; make all; DEBUG=1 make all
- name: run unit test in SIM
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
echo "Run, Build Application using script"
wget https://download.01.org/intel-sgx/sgx-linux/2.24/distro/ubuntu22.04-server/sgx_linux_x64_sdk_2.24.100.3.bin;
chmod +x *.bin; echo yes | ./sgx_linux_x64_sdk_2.*.bin;
wget https://www.openssl.org/source/openssl-3.0.13.tar.gz --directory-prefix=openssl_source/;
wget https://www.openssl.org/source/openssl-3.0.14.tar.gz --directory-prefix=openssl_source/;
source sgxsdk/environment; cd Linux; make sgxssl_no_mitigation
- name: Perform CodeQL Analysis
Expand Down
3 changes: 2 additions & 1 deletion Linux/package/include/sgx_tsgxssl.edl
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ enclave {
from "sgx_tstdc.edl" import *;

untrusted {
void u_sgxssl_ftime([out, size=timeb_len] void * timeptr, uint32_t timeb_len);
void u_sgxssl_ftime([out, size=timeb_len] void * timeptr, uint32_t timeb_len);
void u_sgxssl_usleep(int micro_seconds);
};

};
6 changes: 5 additions & 1 deletion Linux/sgx/libsgx_tsgxssl/ttime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ int sgxssl_clock_gettime(int clk_id, struct timespec *tp)

void sgxssl_usleep(int micro_seconds)
{
(void)micro_seconds;
u_sgxssl_usleep(micro_seconds);
}
void sgxssl_sleep(int seconds)
{
u_sgxssl_usleep(1000000 * seconds);
}
}
1 change: 1 addition & 0 deletions openssl_source/bypass_to_sgxssl.h
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ char * sgxssl___builtin___strcpy_chk(char *dest, const char *src, unsigned int d
#define gmtime sgxssl_gmtime
#define gettimeofday sgxssl_gettimeofday
#define usleep sgxssl_usleep
#define sleep sgxssl_sleep

//openssl 1.1.1 new APIs
//
Expand Down

0 comments on commit 790658c

Please sign in to comment.