Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch jve #210

Open
wants to merge 89 commits into
base: comp-integrity
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
f17d8a8
Support for multiple branched CaseWhen
Oct 2, 2020
366e92c
Interval (#116)
eric-feng-2011 Nov 22, 2020
c7fcd98
Remove partition ID argument from enclaves
chester-leung Nov 23, 2020
93dbf5e
Fix comments
chester-leung Nov 24, 2020
f357ab2
updates
chester-leung Nov 24, 2020
bb4018a
Merge serialization of ecall string as int
chester-leung Nov 30, 2020
56ace17
Modifications to integrate crumb, log-mac, and all-outputs_mac, wip
chester-leung Dec 2, 2020
21bbbfb
Store log mac after each output buffer, add all-outputs-mac to each e…
chester-leung Dec 4, 2020
549566f
Add all_outputs_mac to all EncryptedBlocks once all log_macs have bee…
chester-leung Dec 7, 2020
55ee664
Almost builds
chester-leung Dec 9, 2020
057caec
cpp builds
chester-leung Dec 10, 2020
db54c44
Use ubyte for all_outputs_mac
chester-leung Dec 10, 2020
e77f1eb
use Mac for all_outputs_mac
chester-leung Dec 10, 2020
736b8f6
Hopefully this works for flatbuffers all_outputs_mac mutation, cpp bu…
chester-leung Dec 10, 2020
cbb2373
merge
Dec 10, 2020
0351b5d
Merge branch 'comp-integrity' of https://github.com/mc2-project/opaqu…
Dec 10, 2020
3002bd3
Scala builds now too, running into error with union
chester-leung Dec 11, 2020
dc54741
Stuff builds, error with all outputs mac serialization. this commit u…
chester-leung Dec 11, 2020
5be9b7c
Fixed bug, basic encryption / show works
chester-leung Dec 12, 2020
86fab02
All single partition tests pass, multiple partiton passes until tpch-9
chester-leung Dec 12, 2020
8b1a1d1
All tests pass except tpch-9 and skew join
chester-leung Dec 12, 2020
18f45d6
comment tpch back in
chester-leung Dec 12, 2020
123fa1f
Merge branch 'crumb-path' of http://github.com/chester-leung/opaque i…
Dec 13, 2020
bfc06ba
Check same number of ecalls per partition - exception for scanCollect…
Dec 14, 2020
c818a41
First attempt at constructing executed DAG
Dec 14, 2020
39a4945
Fix typos
Dec 14, 2020
c970965
Rework graph
Dec 14, 2020
43ccd2e
Add log macs to graph nodes
Dec 15, 2020
69fc49e
Construct expected DAG and refactor JobNode.
Dec 16, 2020
35691ff
Implement 'paths to sink' for a DAG
Dec 17, 2020
98d5fc4
add crumb for last ecall
Dec 18, 2020
29e3312
Fix NULL handling for aggregation (#130)
wzheng Dec 18, 2020
51b621b
Changing operator matching from logical to physical (#129)
wzheng Dec 21, 2020
e9fe7bb
Aggregation rewrite (#132)
wzheng Jan 21, 2021
1ee8d5b
Merge new aggregate
Jan 25, 2021
4a97c66
updated build/sbt file (#135)
octaviansima Jan 26, 2021
2400a94
Travis update (#137)
wzheng Jan 29, 2021
6031a4a
update breeze (#138)
octaviansima Jan 29, 2021
0a20d71
TPC-H test suite added (#136)
octaviansima Jan 29, 2021
2fec4ad
Separate IN PR (#124)
Chenyu-Shi Jan 30, 2021
7cb2f9a
Merge new aggregate
Feb 1, 2021
c3b3f33
Uncomment log_mac_lst clear
Feb 1, 2021
f41ba90
Clean up comments
Feb 2, 2021
b78b4a4
Separate Concat PR (#125)
Chenyu-Shi Feb 2, 2021
2bb2e8d
Clean up comments in other files
Feb 4, 2021
2685530
Update pathsEqual to be less conservative
Feb 4, 2021
7efb677
Remove print statements from unit tests
Feb 4, 2021
0519def
Removed calls to toSet in TPC-H tests (#140)
octaviansima Feb 5, 2021
0d69b7b
Documentation update (#148)
wzheng Feb 5, 2021
0f877d4
Cluster Remote Attestation Fix (#146)
octaviansima Feb 8, 2021
c215a99
upgrade to 3.0.1 (#144)
octaviansima Feb 8, 2021
8bd1e09
Update two TPC-H queries (#149)
wzheng Feb 8, 2021
823d95d
TPC-H 20 Fix (#142)
octaviansima Feb 8, 2021
fbe324c
Add expected operator DAG generation from executedPlan string
Feb 8, 2021
f822784
Rebase
Feb 8, 2021
40e8e13
Merge comp-integrity
Feb 9, 2021
6e60c7c
Merge master
Feb 9, 2021
1321eaa
Merge branch 'expected-dag' of https://github.com/andrewlawhh/opaque …
Feb 9, 2021
b4ba2db
Join update (#145)
wzheng Feb 9, 2021
375de7f
Merge join update
Feb 9, 2021
8682f22
Integrate new join
Feb 9, 2021
c21cb7b
Add expected operator for sortexec
Feb 10, 2021
c1adf85
Merge comp-integrity with join update
Feb 10, 2021
9391435
Merge comp-integrity with join update
Feb 10, 2021
2b37dab
Merge join integration with expected dag update
Feb 10, 2021
8a93c6c
Remove some print statements
Feb 10, 2021
c190aae
Migrate from Travis CI to Github Actions (#156)
octaviansima Feb 10, 2021
41ea7b9
Upgrade to OE 0.12 (#153)
wzheng Feb 12, 2021
29da474
Update README.md
wzheng Feb 13, 2021
4d89ecb
Support for scalar subquery (#157)
wzheng Feb 18, 2021
96e6285
Add TPC-H Benchmarks (#139)
octaviansima Feb 19, 2021
b350992
Construct expected DAG from dataframe physical plan
Feb 23, 2021
20f4749
Refactor collect and add integrity checking helper function to Opaque…
Feb 23, 2021
3c28b5f
Float expressions (#160)
wzheng Feb 23, 2021
a4a6ff9
Broadcast Nested Loop Join - Left Anti and Left Semi (#159)
octaviansima Feb 24, 2021
a96abc5
Move join condition handling for equi-joins into enclave code (#164)
wzheng Feb 26, 2021
a5278a4
Distinct aggregation support (#163)
octaviansima Mar 1, 2021
e9b075b
Remove addExpectedOperator from JobVerificationEngine, add comments
Mar 4, 2021
dabc178
Implement expected DAG construction by doing graph manipulation on da…
Mar 4, 2021
38c9da5
Merge
Mar 15, 2021
98bcfdb
Fix merge errors in the test cases
Mar 15, 2021
592ec17
Fix merge errors
Mar 15, 2021
e3e140d
Merge BNLJ into integrity branch
Apr 2, 2021
67fd713
Merge join logic migration into integrity branch
Apr 2, 2021
29db9e6
Merge join logic migration into integrity branch
Apr 2, 2021
886eda8
Merge distinct aggregation support into integrity branch
Apr 2, 2021
1fb4a5a
Fix merge errors
Apr 2, 2021
8ba5f75
fix treeToList to skip visited vertices and operatorDAGFromPlan to pr…
Apr 10, 2021
898a1b4
Add descriptive comments to each function and class
Apr 11, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge serialization of ecall string as int
chester-leung committed Nov 30, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit bb4018a309a41bb4c814fb5c2e70f60a097b260c
13 changes: 0 additions & 13 deletions src/enclave/Enclave/IntegrityUtils.cpp
Original file line number Diff line number Diff line change
@@ -125,9 +125,6 @@ void verify_log(const tuix::EncryptedBlocks *encrypted_blocks,
for (int i = 0; i < num_curr_entries; i++) {
auto curr_log_entry = curr_entries_vec->Get(i);
std::string curr_ecall = curr_log_entry->ecall()->str();
// int snd_pid = curr_log_entry->snd_pid();
// int rcv_pid = -1;
// int job_id = curr_log_entry->job_id();
int num_macs = curr_log_entry->num_macs();
int num_past_entries = num_past_entries_vec->Get(i);

@@ -191,13 +188,3 @@ void mac_log_entry_chain(int num_bytes_to_mac, uint8_t* to_mac, uint8_t* mac_lst

}

// int get_past_ecalls_lengths(std::vector<LogEntry> past_log_entries, int first_le_index,
// int last_le_index) {
// int past_ecalls_lengths = 0;
// for (int i = first_le_index; i < last_le_index; i++) {
// auto past_log_entry = past_log_entries[i];
// std::string ecall = past_log_entry.ecall;
// past_ecalls_lengths += ecall.length();
// }
// return past_ecalls_lengths;
// }
You are viewing a condensed version of this merge commit. You can view the full changes here.