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.

Sign up for GitHub

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

Upgrade version to version1.1.0 #399

Merged
merged 1 commit into from
Sep 17, 2021
Merged

Upgrade version to version1.1.0 #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Please refer to [Crust sWorker docker mode](docs/Docker.md)
In /opt/crust/crust-sworker/etc/Config.json file you can configure your sworker application.
```
{
"base_path" : "/opt/crust/crust-sworker/1.0.0/sworker_base_path", # sWorker key information location, must be absolute path
"base_path" : "/opt/crust/crust-sworker/1.1.0/sworker_base_path", # sWorker key information location, must be absolute path
"base_url" : "http://127.0.0.1:12222/api/v0", # your sWorker node api address
"data_path" : ["/data1"], # If this item is not set, srd and sealing function cannot be applied

Expand All @@ -71,7 +71,7 @@ In /opt/crust/crust-sworker/etc/Config.json file you can configure your sworker

### Run
```
/opt/crust/crust-sworker/1.0.0/bin/crust-sworker -c /opt/crust/crust-sworker/1.0.0/etc/Config.json
/opt/crust/crust-sworker/1.1.0/bin/crust-sworker -c /opt/crust/crust-sworker/1.1.0/etc/Config.json
```

### Crust sWorker executable file
Expand Down
4 changes: 2 additions & 2 deletions VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1.0.0
SWORKER=1.0.0
1.1.0
SWORKER=1.1.0
4 changes: 2 additions & 2 deletions docs/API.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ Output:
"account" : "5EsgXyVJGnoGQ931Vcbzhcsi64unFhCoc5GhZUJnD8qvzu9j",
"mrenclave" : "cb8a24a6a971d738c6976269358e24bf2af578462fb92ead2d384b619fff6d4a",
"pub_key" : "95178acfcb9f1406de8b14a5f81fa141a2934fcfc6fefa58077ff6a823711b0d5f884332b0b2a8699cd6ce901a7add1bef97365e3a73054cf383bb8bd3cc9460",
"sworker_version" : "1.0.0",
"version" : "1.0.0"
"sworker_version" : "1.1.0",
"version" : "1.1.0"
}
```

Expand Down
2 changes: 1 addition & 1 deletion src/app/include/Resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <stdint.h>
#include "Parameter.h"

#define VERSION "1.0.0"
#define VERSION "1.1.0"

#define CRUST_INST_DIR "/opt/crust/crust-sworker/" VERSION
#define ENCLAVE_FILE_PATH CRUST_INST_DIR "/etc/enclave.signed.so"
Expand Down
2 changes: 1 addition & 1 deletion src/enclave/include/Parameter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ typedef crust_status_t (*ecall_store2_f)(const uint8_t *u, size_t s);
typedef sgx_status_t (*ocall_get2_f)(crust_status_t *status, uint8_t *u, size_t s, size_t *rs);

// For all
#define SWORKER_VERSION "1.0.0"
#define SWORKER_VERSION "1.1.0"
#define LEAF_SEPARATOR "+leaf+"

// For enclave metadata
Expand Down