File tree 6 files changed +1
-102
lines changed
6 files changed +1
-102
lines changed Original file line number Diff line number Diff line change 13
13
14
14
#include < fcntl.h>
15
15
#include < functional>
16
-
17
- #if !defined(INSIDE_ENCLAVE) || defined(VIRTUAL_ENCLAVE)
18
- # include < sys/ioctl.h>
19
- #else
20
- # include " ccf/pal/attestation_sgx.h"
21
- #endif
16
+ #include < sys/ioctl.h>
22
17
23
18
namespace ccf ::pal
24
19
{
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -15,13 +15,4 @@ namespace ccf::pal
15
15
* Virtual enclaves and the host code share the same PAL.
16
16
*/
17
17
using Mutex = std::mutex;
18
-
19
- #if !defined(INSIDE_ENCLAVE) || defined(VIRTUAL_ENCLAVE)
20
- static inline void speculation_barrier () {}
21
- #else
22
- static inline void speculation_barrier ()
23
- {
24
- oe_lfence ();
25
- }
26
- #endif
27
18
}
Original file line number Diff line number Diff line change @@ -164,8 +164,6 @@ extern "C"
164
164
165
165
ccf::enclavetime::host_time_us =
166
166
static_cast <decltype (ccf::enclavetime::host_time_us)>(time_location);
167
-
168
- ccf::pal::speculation_barrier ();
169
167
}
170
168
171
169
if (!ccf::pal::is_outside_enclave (ccf_config, ccf_config_size))
@@ -181,8 +179,6 @@ extern "C"
181
179
return CreateNodeStatus::MemoryNotOutsideEnclave;
182
180
}
183
181
184
- ccf::pal::speculation_barrier ();
185
-
186
182
ccf::StartupConfig cc =
187
183
nlohmann::json::parse (ccf_config, ccf_config + ccf_config_size);
188
184
Original file line number Diff line number Diff line change 16
16
#include < cstdarg>
17
17
#include < quickjs/quickjs.h>
18
18
19
- #if defined(INSIDE_ENCLAVE) && !defined(VIRTUAL_ENCLAVE)
20
- # include < openenclave/3rdparty/libc/sys/time.h> // For timeval
21
- #endif
22
-
23
19
namespace ccf ::js::core
24
20
{
25
21
namespace
Original file line number Diff line number Diff line change @@ -317,8 +317,6 @@ namespace ccf
317
317
return false ;
318
318
}
319
319
320
- ccf::pal::speculation_barrier ();
321
-
322
320
std::copy (
323
321
pending_snapshot.serialised_snapshot .begin (),
324
322
pending_snapshot.serialised_snapshot .end (),
You can’t perform that action at this time.
0 commit comments