From df6d276961fdaf2ec07af34bbd3f2ac81b69a47e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@home.arpa>
Date: Sat, 10 Sep 2022 08:56:37 +0200
Subject: [PATCH] add P11-Module and set default variable

---
 bin/signpubkey | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/signpubkey b/bin/signpubkey
index 57709ce..45256e9 100755
--- a/bin/signpubkey
+++ b/bin/signpubkey
@@ -4,13 +4,14 @@
 usage() {
     cat << EOF
     
-    Usage: $(dirname $0) [-n|--principals] <principal>[,<principal>[,<principal>[,...]]] [-V|--valid-time] <TIME> [-s|--serialnumber] <INT> [-S|-serialnumber-file] <filename> [-I|--identity] [--dry-run] <identity> publickey
+    Usage: $(dirname $0) [-t|--hsm] [-U|-H] [-n|--principals] <principal>[,<principal>[,<principal>[,...]]] [-V|--valid-time] <TIME> [-s|--serialnumber] <INT> [-S|-serialnumber-file] <filename> [-I|--identity] <identity> [--dry-run] <publickey>
 
 
 EOF
 
 }
 default_serialnumberfile="${HOME}/ssh-ca/serialnumbers/serialnumber"
+host_or_user=user
 
 set -- $(getopt -u -o hHn:V:s:S:I:tU --long help,host,user,principals:,valid-time:,serialnumber:,serialnumber-file:,identity:,hms,dry-run -- "$@"|| exit $?)
 
@@ -18,6 +19,7 @@ while : ;do
     case $1 in
         -h|--help)
             usage
+            exit 0
             break
             ;;
         -H|host)
@@ -91,7 +93,7 @@ case $host_or_user in
 esac
 
 if ${hms:-false};then
-    echo ssh-keygen -s $CABASE/${host_or_user^^}_CA/${host_or_user}_ca.pub -n "${principals}" -V "${validtime}" -z $serialnumber -I "${identity}" "$1"
+    echo ssh-keygen -s $CABASE/${host_or_user^^}_CA/${host_or_user}_ca.pub -D $P11M -n "${principals}" -V "${validtime}" -z $serialnumber -I "${identity}" "$1"
     [ $DRY ] || ssh-keygen -s $CABASE/${host_or_user^^}_CA/${host_or_user}_ca.pub -D $P11M -n "${principals}" -V "${validtime}" -z $serialnumber -I "${identity}" "$1"
 else
     echo ssh-keygen -s $CABASE/${host_or_user^^}_CA/${host_or_user}_ca -n "${principals}" -V "${validtime}" -z $serialnumber -I "${identity}" "$1"