Merge pull request #319 from Superhepper/msrv

Adds MSRV ci check

Author: wiktor-k

.github/workflows/ci.yml

@@ -23,7 +23,16 @@ jobs:
       - uses: actions/checkout@v2
       - name: Check formatting
         run: cargo fmt --all -- --check
-
+  # Check that it builds with the Minimum Supported Rust Version      
+  msrv:
+    name: Check minimum supported rust version (MSRV)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build the container
+        run: docker build -t ubuntucontainer tss-esapi/tests/ --file tss-esapi/tests/Dockerfile-ubuntu
+      - name: Run the container
+        run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi --env RUST_TOOLCHAIN_VERSION=1.53.0 ubuntucontainer /tmp/rust-tss-esapi/tss-esapi/tests/all-ubuntu.sh
   # All in one job as I think it is a big overhead to build and run the Docker
   # container?
   tests-ubuntu:

README.md

@@ -6,7 +6,9 @@ The `tss-esapi` Rust crate provides an idiomatic interface to the TCG TSS 2.0 En
 
 At the moment we test (via CI) and support the following Rust compiler versions:
 
-* On Ubuntu we test with the latest stable compiler version, as accessible through `rustup`.
+* On Ubuntu we test with:
+    - The latest stable compiler version, as accessible through `rustup`.
+    - The 1.53 compiler version.
 * On Fedora we test with the compiler version included with the Fedora 33 release.
 
 If you need support for other versions of the compiler, get in touch with us to see what we can do!

tss-esapi/tests/all-ubuntu.sh

@@ -10,6 +10,13 @@
 
 set -euf -o pipefail
 
+#################################################
+# Change rust toolchain version
+#################################################
+if [[ ! -z ${RUST_TOOLCHAIN_VERSION:+x} ]]; then
+	rustup override set ${RUST_TOOLCHAIN_VERSION}
+fi
+
 #################################################
 # Generate bindings for non-"standard" versions #
 #################################################

tss-esapi/tests/integration_tests/abstraction_tests/transient_key_context_tests.rs

@@ -618,8 +618,8 @@ fn activate_credential() {
     let (material, auth) = ctx.create_key(params, 16).unwrap();
     let obj = ObjectWrapper {
         material,
-        auth,
         params,
+        auth,
     };
     let make_cred_params = ctx.get_make_cred_params(obj.clone(), None).unwrap();
 
@@ -696,8 +696,8 @@ fn make_cred_params_name() {
     let (material, auth) = ctx.create_key(params, 16).unwrap();
     let obj = ObjectWrapper {
         material,
-        auth,
         params,
+        auth,
     };
     let make_cred_params = ctx.get_make_cred_params(obj, None).unwrap();
 
@@ -729,17 +729,17 @@ fn activate_credential_wrong_key() {
     let (material, auth) = ctx.create_key(params, 16).unwrap();
     let obj = ObjectWrapper {
         material,
-        auth,
         params,
+        auth,
     };
     let make_cred_params = ctx.get_make_cred_params(obj, None).unwrap();
 
     // "Wrong" key (which will be used instead of the good key in attestation)
     let (material, auth) = ctx.create_key(params, 16).unwrap();
     let wrong_obj = ObjectWrapper {
         material,
-        auth,
         params,
+        auth,
     };
 
     drop(ctx);
@@ -824,8 +824,8 @@ fn activate_credential_wrong_data() {
     let (material, auth) = ctx.create_key(params, 16).unwrap();
     let obj = ObjectWrapper {
         material,
-        auth,
         params,
+        auth,
     };
 
     // No data (essentially wrong size)

tss-esapi/tests/integration_tests/structures_tests/lists_tests/command_code_list_tests.rs

@@ -41,7 +41,6 @@ fn test_conversions() {
         });
 
     let tpml_cc: TPML_CC = command_code_list
-        .clone()
         .try_into()
         .expect("Failed to convert CommandCodeList into TPML_CC");