Revert: Change cmdline options --hwPrivKeyX to --hwKeyX (part 2)

This change is dependent on the related change to genPnorImages.pl in
Hostboot, and although it's changed upstream, there are still active
op-build machine configs that are locked to an older version.  So it's
unclear when this change can be finalized.  For now I'm going to punt
and allow the old cmdline options to still work, and continue to
support both the new and deprecated cmdline options.

Signed-off-by: Dave Heller <hellerda@us.ibm.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/crtSignedContainer.sh b/crtSignedContainer.sh
index 32d2f4a..082872e 100755
--- a/crtSignedContainer.sh
+++ b/crtSignedContainer.sh
@@ -314,6 +314,12 @@ for arg in "$@"; do
     "--verbose")    set -- "$@" "-v" ;;
     "--debug")      set -- "$@" "-d" ;;
     "--wrap")       set -- "$@" "-w" ;;
+    "--hwPrivKeyA") set -- "$@" "-a" ;;
+    "--hwPrivKeyB") set -- "$@" "-b" ;;
+    "--hwPrivKeyC") set -- "$@" "-c" ;;
+    "--swPrivKeyP") set -- "$@" "-p" ;;
+    "--swPrivKeyQ") set -- "$@" "-q" ;;
+    "--swPrivKeyR") set -- "$@" "-r" ;;
     "--hwKeyA") set -- "$@" "-a" ;;
     "--hwKeyB") set -- "$@" "-b" ;;
     "--hwKeyC") set -- "$@" "-c" ;;