Skip to content

Commit f79cfbf

Browse files
dingelishdingelish
committed
Port to sgx 1.1.3
1 parent 7e6d4b4 commit f79cfbf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+7526
-24
lines changed

‎.drone.yml

Lines changed: 237 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,237 @@
1+
kind: pipeline
2+
name: http_req-sgx-xargo-1604-sw
3+
4+
steps:
5+
- name: sim-compile
6+
image: baiduxlab/sgx-rust:1604-1.1.3
7+
commands:
8+
- . /opt/sgxsdk/environment
9+
- . /root/.cargo/env
10+
- cd sgx && SGX_MODE=SW XARGO_SGX=1 make -C http_req-sgx-test
11+
12+
- name: sim-test
13+
image: baiduxlab/sgx-rust:1604-1.1.3
14+
commands:
15+
- . /opt/sgxsdk/environment
16+
- cd sgx/http_req-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
17+
18+
node:
19+
instance: sgx
20+
21+
---
22+
23+
kind: pipeline
24+
name: http_req-sgx-xargo-1604-hw
25+
26+
steps:
27+
- name: hw-compile
28+
image: baiduxlab/sgx-rust:1604-1.1.3
29+
commands:
30+
- . /opt/sgxsdk/environment
31+
- . /root/.cargo/env
32+
- cd sgx && XARGO_SGX=1 make -C http_req-sgx-test
33+
34+
- name: hw-test
35+
image: baiduxlab/sgx-rust:1604-1.1.3
36+
privileged: true
37+
volumes:
38+
- name: isgx
39+
path: /dev/isgx
40+
- name: aesmd
41+
path: /var/run/aesmd/aesm.socket
42+
commands:
43+
- . /opt/sgxsdk/environment
44+
- ls -l /dev/isgx
45+
- ls -l /var/run/aesmd/aesm.socket
46+
- cd sgx/http_req-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
47+
48+
volumes:
49+
- name: isgx
50+
host:
51+
path: /dev/isgx
52+
- name: aesmd
53+
host:
54+
path: /var/run/aesmd/aesm.socket
55+
56+
node:
57+
instance: sgx
58+
59+
---
60+
61+
kind: pipeline
62+
name: http_req-sgx-xargo-1804-sw
63+
64+
steps:
65+
- name: sim-compile
66+
image: baiduxlab/sgx-rust:1804-1.1.3
67+
commands:
68+
- . /opt/sgxsdk/environment
69+
- . /root/.cargo/env
70+
- cd sgx && SGX_MODE=SW XARGO_SGX=1 make -C http_req-sgx-test
71+
72+
- name: sim-test
73+
image: baiduxlab/sgx-rust:1804-1.1.3
74+
commands:
75+
- . /opt/sgxsdk/environment
76+
- cd sgx/http_req-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
77+
78+
node:
79+
instance: sgx
80+
81+
---
82+
83+
kind: pipeline
84+
name: http_req-sgx-xargo-1804-hw
85+
86+
steps:
87+
- name: hw-compile
88+
image: baiduxlab/sgx-rust:1804-1.1.3
89+
commands:
90+
- . /opt/sgxsdk/environment
91+
- . /root/.cargo/env
92+
- cd sgx && XARGO_SGX=1 make -C http_req-sgx-test
93+
94+
- name: hw-test
95+
image: baiduxlab/sgx-rust:1804-1.1.3
96+
privileged: true
97+
volumes:
98+
- name: isgx
99+
path: /dev/isgx
100+
- name: aesmd
101+
path: /var/run/aesmd/aesm.socket
102+
commands:
103+
- . /opt/sgxsdk/environment
104+
- ls -l /dev/isgx
105+
- ls -l /var/run/aesmd/aesm.socket
106+
- cd sgx/http_req-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
107+
108+
volumes:
109+
- name: isgx
110+
host:
111+
path: /dev/isgx
112+
- name: aesmd
113+
host:
114+
path: /var/run/aesmd/aesm.socket
115+
116+
node:
117+
instance: sgx
118+
119+
---
120+
121+
kind: pipeline
122+
name: http_req-sgx-1604-sw
123+
124+
steps:
125+
- name: sim-compile
126+
image: baiduxlab/sgx-rust:1604-1.1.3
127+
commands:
128+
- . /opt/sgxsdk/environment
129+
- . /root/.cargo/env
130+
- SGX_MODE=SW make -C sgx/http_req-sgx-test
131+
132+
- name: sim-test
133+
image: baiduxlab/sgx-rust:1604-1.1.3
134+
commands:
135+
- . /opt/sgxsdk/environment
136+
- cd sgx/http_req-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
137+
138+
node:
139+
instance: sgx
140+
141+
---
142+
143+
kind: pipeline
144+
name: http_req-sgx-1604-hw
145+
146+
steps:
147+
- name: hw-compile
148+
image: baiduxlab/sgx-rust:1604-1.1.3
149+
commands:
150+
- . /opt/sgxsdk/environment
151+
- . /root/.cargo/env
152+
- make -C sgx/http_req-sgx-test
153+
154+
- name: hw-test
155+
image: baiduxlab/sgx-rust:1604-1.1.3
156+
privileged: true
157+
volumes:
158+
- name: isgx
159+
path: /dev/isgx
160+
- name: aesmd
161+
path: /var/run/aesmd/aesm.socket
162+
commands:
163+
- . /opt/sgxsdk/environment
164+
- ls -l /dev/isgx
165+
- ls -l /var/run/aesmd/aesm.socket
166+
- cd sgx/http_req-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
167+
168+
volumes:
169+
- name: isgx
170+
host:
171+
path: /dev/isgx
172+
- name: aesmd
173+
host:
174+
path: /var/run/aesmd/aesm.socket
175+
176+
node:
177+
instance: sgx
178+
179+
---
180+
181+
kind: pipeline
182+
name: http_req-sgx-1804-sw
183+
184+
steps:
185+
- name: sim-compile
186+
image: baiduxlab/sgx-rust:1804-1.1.3
187+
commands:
188+
- . /opt/sgxsdk/environment
189+
- . /root/.cargo/env
190+
- SGX_MODE=SW make -C sgx/http_req-sgx-test
191+
192+
- name: sim-test
193+
image: baiduxlab/sgx-rust:1804-1.1.3
194+
commands:
195+
- . /opt/sgxsdk/environment
196+
- cd sgx/http_req-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
197+
198+
node:
199+
instance: sgx
200+
201+
---
202+
203+
kind: pipeline
204+
name: http_req-sgx-1804-hw
205+
206+
steps:
207+
- name: hw-compile
208+
image: baiduxlab/sgx-rust:1804-1.1.3
209+
commands:
210+
- . /opt/sgxsdk/environment
211+
- . /root/.cargo/env
212+
- make -C sgx/http_req-sgx-test
213+
214+
- name: hw-test
215+
image: baiduxlab/sgx-rust:1804-1.1.3
216+
privileged: true
217+
volumes:
218+
- name: isgx
219+
path: /dev/isgx
220+
- name: aesmd
221+
path: /var/run/aesmd/aesm.socket
222+
commands:
223+
- . /opt/sgxsdk/environment
224+
- ls -l /dev/isgx
225+
- ls -l /var/run/aesmd/aesm.socket
226+
- cd sgx/http_req-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
227+
228+
volumes:
229+
- name: isgx
230+
host:
231+
path: /dev/isgx
232+
- name: aesmd
233+
host:
234+
path: /var/run/aesmd/aesm.socket
235+
236+
node:
237+
instance: sgx

‎.github/pull.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: "1"
2+
rules:
3+
- base: master
4+
upstream: jayjamesjay:master
5+
mergeMethod: none

‎.github/workflows/rust.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/target
22
**/*.rs.bk
3-
/.idea
3+
/.idea
4+
Cargo.lock

‎Cargo.toml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,37 @@ readme = "README.md"
99
categories = ["web-programming::http-client", "network-programming"]
1010
keywords = ["http", "client", "request"]
1111
edition = "2018"
12+
exclude = [ "sgx/*", ]
1213

1314
[dependencies]
14-
unicase = "^2.6"
15+
unicase = { git = "https://github.com/mesalock-linux/unicase-sgx" }
16+
sgx_tstd = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true ,features = ["net", "untrusted_time"]}
1517

1618
[features]
17-
default = ["native-tls"]
19+
default = ["rust-tls", "mesalock_sgx"]
1820
rust-tls = ["rustls", "webpki", "webpki-roots"]
21+
mesalock_sgx = ["sgx_tstd"]
1922

20-
[dependencies.native-tls]
21-
version = "^0.2"
22-
optional = true
23+
#[dependencies.native-tls]
24+
#version = "^0.2"
25+
#optional = true
2326

2427
[dependencies.rustls]
2528
version = "^0.19"
29+
git = "https://github.com/mesalock-linux/rustls"
30+
branch = "mesalock_sgx"
2631
optional = true
2732

2833
[dependencies.webpki]
2934
version = "^0.21"
35+
git = "https://github.com/mesalock-linux/webpki"
36+
branch = "mesalock_sgx"
3037
optional = true
3138

3239
[dependencies.webpki-roots]
3340
version = "^0.21"
41+
git = "https://github.com/mesalock-linux/webpki-roots"
42+
branch = "mesalock_sgx"
3443
optional = true
3544

3645
[badges]

0 commit comments

Comments
 (0)