Merge #631 #632

631: Problem: no clean up for reproducible / portable pipelines r=tomtau a=tomtau

Solution: marked docker containers with git sha and added a container stop teardown

632: Bump aead to 0.2 and aes-gcm-siv to 0.3 r=tomtau a=tomtau

as #629 is incomplete

Co-authored-by: Tomas Tauber <2410580+tomtau@users.noreply.github.com>

.drone.yml

@@ -51,13 +51,13 @@ steps:
 #       - success
 #       - failure
 
-trigger:
-  branch:
-  - master
-  - staging
-  - trying
-  event:
-  - push
+# trigger:
+#   branch:
+#   - master
+#   - staging
+#   - trying
+#   event:
+#   - push
 
 ---
 kind: pipeline
@@ -73,7 +73,14 @@ steps:
   commands:
   - ls -l /dev/sgx
   - ls -l /var/run/aesmd/aesm.socket
-  - docker run --rm -v $PWD:/chain --device /dev/sgx cryptocom/chain:latest /bin/bash /chain/ci-scripts/tx-validation-hw-test.sh
+  - docker run --name hw1-${DRONE_COMMIT_SHA} --rm -v $PWD:/chain --device /dev/sgx cryptocom/chain:latest /bin/bash /chain/ci-scripts/tx-validation-hw-test.sh
+- name: Teardown		
+  commands:		
+   - docker stop hw1-${DRONE_COMMIT_SHA} || exit 0		
+  when:		
+    status:		
+      - success		
+      - failure
 
 trigger:
   branch:
@@ -102,7 +109,14 @@ steps:
   commands:
   - ls -l /dev/sgx
   - ls -l /var/run/aesmd/aesm.socket
-  - docker run --rm --env SPID=$SPID --env IAS_API_KEY=$IAS_API_KEY -v $PWD:/chain --device /dev/sgx cryptocom/chain:latest /bin/bash /chain/ci-scripts/tx-query-hw-test.sh
+  - docker run --name hw2-${DRONE_COMMIT_SHA} --rm --env SPID=$SPID --env IAS_API_KEY=$IAS_API_KEY -v $PWD:/chain --device /dev/sgx cryptocom/chain:latest /bin/bash /chain/ci-scripts/tx-query-hw-test.sh
+- name: Teardown		
+  commands:		
+   - docker stop hw2-${DRONE_COMMIT_SHA} || exit 0		
+  when:		
+    status:		
+      - success		
+      - failure
 
 trigger:
   branch:
@@ -114,6 +128,6 @@ trigger:
 
 ---
 kind: signature
-hmac: ee167569e3c167ba42f4f260c78ff358816fc8826e0d5b94f22cfb7f4fd30075
+hmac: 8c0ea390f8d2afe9975a18473c01569112444233423ebb3888e5425b03f98623
 
 ...

chain-core/Cargo.toml

@@ -24,7 +24,7 @@ base64 = { version = "0.11", optional = true }
 sgx_tstd = { rev = "v1.0.9", git = "https://github.com/baidu/rust-sgx-sdk.git", optional = true }
 static_assertions = { version = "1.1.0", default-features = false}
 bech32 = { version = "0.7.1", optional = true }
-aead = "0.1.1"
+aead = "0.2"
 
 [dev-dependencies]
 quickcheck = "0.9"

chain-tx-enclave/tx-validation/enclave/Cargo.toml

@@ -31,6 +31,6 @@ enclave-protocol   = { path = "../../../enclave-protocol", default-features = fa
 chain-tx-filter   = { path = "../../../chain-tx-filter", default-features = false, features = ["mesalock_sgx"] }
 lazy_static  = { version = "1.4", features = ["spin_no_std"] }
 enclave-t-common = { path = "../../enclave-t-common" }
-aes-gcm-siv = "0.2"
-aead = "0.1"
+aes-gcm-siv = "0.3"
+aead = "0.2"
 zeroize = { version = "1.0", default-features = false }

client-common/Cargo.toml

@@ -10,7 +10,7 @@ chain-tx-filter = { path = "../chain-tx-filter" }
 secp256k1zkp = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "8b9a38b870a7759fcdbd4a5d435b5ba873c70afd", features = ["serde", "zeroize", "rand", "recovery", "endomorphism", "musig"] }
 rand = "0.7"
 log = "0.4"
-aes-gcm-siv = "0.2"
+aes-gcm-siv = "0.3"
 blake2 = "0.8"
 hex = "0.4"
 base64 = "0.11"