From a80ff4279c15f9dd4ae1c982ad5d567ec5d7c8bc Mon Sep 17 00:00:00 2001
From: Julien Cretin <cretin@google.com>
Date: Fri, 13 Aug 2021 11:08:45 +0200
Subject: [PATCH] Install Rust tools with stable compiler

We only need the frozen nightly for Tock (and maybe the app).
---
 fuzzing_setup.sh | 2 +-
 setup.sh         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fuzzing_setup.sh b/fuzzing_setup.sh
index 66edabb..99e0532 100755
--- a/fuzzing_setup.sh
+++ b/fuzzing_setup.sh
@@ -20,4 +20,4 @@ done_text="$(tput bold)DONE.$(tput sgr0)"
 set -e
 
 # Install cargo-fuzz library.
-cargo install cargo-fuzz
+cargo +stable install cargo-fuzz
diff --git a/setup.sh b/setup.sh
index 6d58053..90ee8c8 100755
--- a/setup.sh
+++ b/setup.sh
@@ -43,7 +43,8 @@ rustup target add thumbv7em-none-eabi
 
 # Install dependency to create applications.
 mkdir -p elf2tab
-cargo install elf2tab --version 0.6.0 --root elf2tab/
+rustup install stable
+cargo +stable install elf2tab --version 0.6.0 --root elf2tab/
 
 # Install python dependencies to factory configure OpenSK (crypto, JTAG lockdown)
 pip3 install --user --upgrade colorama tqdm cryptography "fido2>=0.9.1"