Renamed upgrade script (#121)

- Removed "no attestation" versions of upgrade scripts
- Renamed `upgrade-v2-device` to `upgrade-existing-device`
- Removed unused code

dist/README-cli.md

@@ -30,7 +30,7 @@ To upgrade an existing powHSM device to a newer firmware version, you will first
 Then, to execute the upgrade process, within the `/path/to/dist` directory, issue:
 
 ```
-/path/to/dist> ./upgrade-v2-device
+/path/to/dist> ./upgrade-existing-device
 ```
 
 and follow the instructions.

dist/README.md

@@ -49,7 +49,7 @@ To upgrade an existing powHSM device, you will first need:
 Then, to execute the upgrade process, within the `/path/to/dist` directory, issue:
 
 ```
-/path/to/dist> ./upgrade-v2-device
+/path/to/dist> ./upgrade-existing-device
 ```
 
 and follow the instructions.

dist/scripts/upgrade-v2 → dist/scripts/upgrade-existing

@@ -6,15 +6,6 @@ popd > /dev/null
 
 TARGET_ID="$(cat $ROOT_DIR/scripts/target.id)"
 
-# Exclude attestation?
-DO_ATTESTATION="yes"
-if [[ "$1" == "--noatt" ]]; then
-    DO_ATTESTATION="no"
-elif [[ "$1" != "" ]]; then
-    echo -e "\e[1;31mInvalid or unknown option '$1'\e[0m"
-    exit 1
-fi
-
 # Binaries
 LBUTILS_DIR="$ROOT_DIR/bin/lbutils"
 LBUTILS_BUNDLE="$LBUTILS_DIR.tgz"
@@ -129,12 +120,7 @@ function createOutputDir() {
 }
 
 function keys() {
-    UNLOCK_OPT="-p$(cat $PIN_FILE)"
-    if [[ "$DO_ATTESTATION" == "yes" ]]; then
-        UNLOCK_OPT="-u"
-    fi
-
-    $ADMIN pubkeys -o $PUBLIC_KEY_FILE $UNLOCK_OPT
+    $ADMIN pubkeys -o $PUBLIC_KEY_FILE -u
     error
 }
 
@@ -154,10 +140,7 @@ echo
 checkFirmware
 checkForPinFile
 checkForSignerAuthFile
-
-if [[ "$DO_ATTESTATION" == "yes" ]]; then
-    checkForAttestationFile
-fi
+checkForAttestationFile
 
 echo -e "\e[1;33mConnect your ledger.\e[0m"
 echo -e "Press [Enter] to continue"
@@ -180,23 +163,15 @@ read continue
 sleep 2
 createOutputDir
 echo
-
-if [[ "$DO_ATTESTATION" == "yes" ]]; then
-    echo -e "\e[1;32mGathering attestation\e[0m"
-    attestation
-    echo
-fi
-
+echo -e "\e[1;32mGathering attestation\e[0m"
+attestation
+echo
 echo -e "\e[1;32mGathering public keys\e[0m"
 keys
 echo
-
-if [[ "$DO_ATTESTATION" == "yes" ]]; then
-    echo -e "\e[1;32mVerifying attestation\e[0m"
-    verify_attestation
-    echo
-fi
-
+echo -e "\e[1;32mVerifying attestation\e[0m"
+verify_attestation
+echo
 echo -e "\e[1;32mpowHSM Upgrade complete.\e[0m"
 echo -e "\e[1;33mPlease disconnect the device.\e[0m"
 echo

dist/upgrade-existing-device

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+$(dirname $0)/scripts/run_with_docker upgrade-existing