Skip to content

Commit 3076246

Browse files
dingelishdingelish
committed
Port to sgx 1.1.2
1 parent 090badc commit 3076246

Some content is hidden

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

113 files changed

+8705
-10
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-sgx-xargo-1604-sw
3+
4+
steps:
5+
- name: sim-compile
6+
image: baiduxlab/sgx-rust:1604-1.1.2
7+
commands:
8+
- . /opt/sgxsdk/environment
9+
- . /root/.cargo/env
10+
- cd sgx && SGX_MODE=SW XARGO_SGX=1 make -C http-sgx-test
11+
12+
- name: sim-test
13+
image: baiduxlab/sgx-rust:1604-1.1.2
14+
commands:
15+
- . /opt/sgxsdk/environment
16+
- cd sgx/http-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-sgx-xargo-1604-hw
25+
26+
steps:
27+
- name: hw-compile
28+
image: baiduxlab/sgx-rust:1604-1.1.2
29+
commands:
30+
- . /opt/sgxsdk/environment
31+
- . /root/.cargo/env
32+
- cd sgx && XARGO_SGX=1 make -C http-sgx-test
33+
34+
- name: hw-test
35+
image: baiduxlab/sgx-rust:1604-1.1.2
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-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-sgx-xargo-1804-sw
63+
64+
steps:
65+
- name: sim-compile
66+
image: baiduxlab/sgx-rust:1804-1.1.2
67+
commands:
68+
- . /opt/sgxsdk/environment
69+
- . /root/.cargo/env
70+
- cd sgx && SGX_MODE=SW XARGO_SGX=1 make -C http-sgx-test
71+
72+
- name: sim-test
73+
image: baiduxlab/sgx-rust:1804-1.1.2
74+
commands:
75+
- . /opt/sgxsdk/environment
76+
- cd sgx/http-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-sgx-xargo-1804-hw
85+
86+
steps:
87+
- name: hw-compile
88+
image: baiduxlab/sgx-rust:1804-1.1.2
89+
commands:
90+
- . /opt/sgxsdk/environment
91+
- . /root/.cargo/env
92+
- cd sgx && XARGO_SGX=1 make -C http-sgx-test
93+
94+
- name: hw-test
95+
image: baiduxlab/sgx-rust:1804-1.1.2
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-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-sgx-1604-sw
123+
124+
steps:
125+
- name: sim-compile
126+
image: baiduxlab/sgx-rust:1604-1.1.2
127+
commands:
128+
- . /opt/sgxsdk/environment
129+
- . /root/.cargo/env
130+
- SGX_MODE=SW make -C sgx/http-sgx-test
131+
132+
- name: sim-test
133+
image: baiduxlab/sgx-rust:1604-1.1.2
134+
commands:
135+
- . /opt/sgxsdk/environment
136+
- cd sgx/http-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-sgx-1604-hw
145+
146+
steps:
147+
- name: hw-compile
148+
image: baiduxlab/sgx-rust:1604-1.1.2
149+
commands:
150+
- . /opt/sgxsdk/environment
151+
- . /root/.cargo/env
152+
- make -C sgx/http-sgx-test
153+
154+
- name: hw-test
155+
image: baiduxlab/sgx-rust:1604-1.1.2
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-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-sgx-1804-sw
183+
184+
steps:
185+
- name: sim-compile
186+
image: baiduxlab/sgx-rust:1804-1.1.2
187+
commands:
188+
- . /opt/sgxsdk/environment
189+
- . /root/.cargo/env
190+
- SGX_MODE=SW make -C sgx/http-sgx-test
191+
192+
- name: sim-test
193+
image: baiduxlab/sgx-rust:1804-1.1.2
194+
commands:
195+
- . /opt/sgxsdk/environment
196+
- cd sgx/http-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-sgx-1804-hw
205+
206+
steps:
207+
- name: hw-compile
208+
image: baiduxlab/sgx-rust:1804-1.1.2
209+
commands:
210+
- . /opt/sgxsdk/environment
211+
- . /root/.cargo/env
212+
- make -C sgx/http-sgx-test
213+
214+
- name: hw-test
215+
image: baiduxlab/sgx-rust:1804-1.1.2
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-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: hyperium:master
5+
mergeMethod: none

‎Cargo.toml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,26 @@ A set of types for representing HTTP requests and responses.
2020
keywords = ["http"]
2121
categories = ["web-programming"]
2222
edition = "2018"
23+
exclude = ["/sgx/*"]
2324

2425
[dependencies]
25-
bytes = "0.5"
26-
fnv = "1.0.5"
27-
itoa = "0.4.1"
26+
bytes = { git = "https://github.com/mesalock-linux/bytes-sgx" }
27+
fnv = { git = "https://github.com/mesalock-linux/rust-fnv-sgx" }
28+
itoa = { git = "https://github.com/mesalock-linux/itoa-sgx" }
29+
sgx_tstd = { rev = "v1.1.2", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
30+
31+
[features]
32+
default = ["mesalock_sgx"]
33+
mesalock_sgx = ["sgx_tstd"]
2834

2935
[dev-dependencies]
30-
indexmap = "1.0"
31-
quickcheck = "0.9.0"
32-
rand = "0.7.0"
33-
seahash = "3.0.5"
34-
serde = "1.0"
35-
serde_json = "1.0"
36-
doc-comment = "0.3"
36+
#indexmap = "1.0"
37+
#quickcheck = "0.9.0"
38+
#rand = "0.7.0"
39+
#seahash = "3.0.5"
40+
#serde = "1.0"
41+
#serde_json = "1.0"
42+
#doc-comment = "0.3"
3743

3844
[[bench]]
3945
name = "header_map"

0 commit comments

Comments
 (0)