Merge pull request #244 from skalenetwork/develop

Intel submission 3

.github/workflows/dockerimagesim.yml

@@ -19,9 +19,9 @@ jobs:
     - name: submodule update
       run: git submodule update --init --recursive
     - name: build container for testing
-      run: python3 scripts/docker_build.py DockerfileSimulation sgxwalletsim ${GITHUB_SHA}
+      run: python3 scripts/docker_build.py DockerfileSimulation sgxwallet_sim ${GITHUB_SHA}
     - name: test
-      run: python3 scripts/docker_test.py DockerfileSimulation sgxwalletsim
+      run: python3 scripts/docker_test.py DockerfileSimulation sgxwallet_sim
     - name: build and deploy docker image
       if: |
         contains(github.ref, 'develop') || contains(github.ref, 'beta') ||

scripts/docker_test.py

@@ -77,3 +77,6 @@ s3.connect((address, 1028))
 s1.close()
 s2.close()
 s3.close()
+
+assert subprocess.call(["docker", "rm", "-f", "sgxwallet"]) == 0
+assert subprocess.call(["rm", "-rf", "sgx_data"]) == 0

secure_enclave/secure_enclave.c

@@ -210,6 +210,8 @@ void *reallocate_function(void *ptr, size_t osize, size_t nsize) {
     return (void *) nptr;
 }
 
+volatile uint64_t counter;
+
 void get_global_random(unsigned char *_randBuff, uint64_t _size) {
     char errString[BUF_LEN];
     int status;
@@ -220,10 +222,11 @@ void get_global_random(unsigned char *_randBuff, uint64_t _size) {
     CHECK_STATE(_size <= 32)
     CHECK_STATE(_randBuff);
 
+    counter++;
     sgx_sha_state_handle_t shaStateHandle;
-
     CHECK_STATE(sgx_sha256_init(&shaStateHandle) == SGX_SUCCESS);
     CHECK_STATE(sgx_sha256_update(globalRandom, 32, shaStateHandle) == SGX_SUCCESS);
+    CHECK_STATE(sgx_sha256_update(&counter, sizeof(counter), shaStateHandle) == SGX_SUCCESS);
     CHECK_STATE(sgx_sha256_get_hash(shaStateHandle, (sgx_sha256_hash_t *)globalRandom) == SGX_SUCCESS);
     CHECK_STATE(sgx_sha256_close(shaStateHandle) == SGX_SUCCESS);