Skip to content

Commit 790658c

Browse files
author
jinghe-INTC
authored
udpate action scripts for OpenSSL 3.0.14 (#221)
And necessary fixes. Signed-off-by: He, Jing J <[email protected]>
1 parent f28cd30 commit 790658c

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

.github/workflows/c-cpp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: install SDK
2626
run: chmod +x *.bin; echo yes | ./sgx_linux_x64_sdk_2.*.bin
2727
- name: download OpenSSL code
28-
run: wget https://www.openssl.org/source/openssl-3.0.13.tar.gz --directory-prefix=openssl_source/
28+
run: wget https://www.openssl.org/source/openssl-3.0.14.tar.gz --directory-prefix=openssl_source/
2929
- name: build SGXSSL
3030
run: source sgxsdk/environment; cd Linux; make all; DEBUG=1 make all
3131
- name: run unit test in SIM

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
echo "Run, Build Application using script"
7070
wget https://download.01.org/intel-sgx/sgx-linux/2.24/distro/ubuntu22.04-server/sgx_linux_x64_sdk_2.24.100.3.bin;
7171
chmod +x *.bin; echo yes | ./sgx_linux_x64_sdk_2.*.bin;
72-
wget https://www.openssl.org/source/openssl-3.0.13.tar.gz --directory-prefix=openssl_source/;
72+
wget https://www.openssl.org/source/openssl-3.0.14.tar.gz --directory-prefix=openssl_source/;
7373
source sgxsdk/environment; cd Linux; make sgxssl_no_mitigation
7474
7575
- name: Perform CodeQL Analysis

Linux/package/include/sgx_tsgxssl.edl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ enclave {
3636
from "sgx_tstdc.edl" import *;
3737

3838
untrusted {
39-
void u_sgxssl_ftime([out, size=timeb_len] void * timeptr, uint32_t timeb_len);
39+
void u_sgxssl_ftime([out, size=timeb_len] void * timeptr, uint32_t timeb_len);
40+
void u_sgxssl_usleep(int micro_seconds);
4041
};
4142

4243
};

Linux/sgx/libsgx_tsgxssl/ttime.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ int sgxssl_clock_gettime(int clk_id, struct timespec *tp)
121121

122122
void sgxssl_usleep(int micro_seconds)
123123
{
124-
(void)micro_seconds;
124+
u_sgxssl_usleep(micro_seconds);
125+
}
126+
void sgxssl_sleep(int seconds)
127+
{
128+
u_sgxssl_usleep(1000000 * seconds);
125129
}
126130
}

openssl_source/bypass_to_sgxssl.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ char * sgxssl___builtin___strcpy_chk(char *dest, const char *src, unsigned int d
250250
#define gmtime sgxssl_gmtime
251251
#define gettimeofday sgxssl_gettimeofday
252252
#define usleep sgxssl_usleep
253+
#define sleep sgxssl_sleep
253254

254255
//openssl 1.1.1 new APIs
255256
//

0 commit comments

Comments
 (0)