X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-keys/blobdiff_plain/2661d8aa033971c32f45392fc70e42f0d9a2c14e..865fc4a1c4add30fbf1b6ab9569682d82e8da7c9:/keyfunc.sh.in

diff --git a/keyfunc.sh.in b/keyfunc.sh.in
index a618e66..6cba169 100644
--- a/keyfunc.sh.in
+++ b/keyfunc.sh.in
@@ -240,6 +240,16 @@ EOF
   done
 }
 
+dumpprops () {
+  prefix=$1
+  ## Write the properties stored in the variables beginning with PREFIX.
+
+  set | sed -n "/^$prefix/{s/=.*\$//;p}" | sort | while read name; do
+    eval value=\$$name
+    echo "${name#$prefix}=$value"
+  done
+}
+
 defprops () {
   name=$1
   ## Define a properties table NAME.
@@ -312,6 +322,7 @@ nubid () {
   ## to demonstrate the same idiocy as GNU mumblesum.
   set _ $({ echo "distorted-keys nubid"; cat -; } |
     openssl dgst -${kprop_nubid_hash-sha256})
+  if [ $# -gt 2 ]; then shift; fi
   echo $2
 }
 
@@ -451,6 +462,7 @@ c_verify () { k_verify "$@"; }
 ## Stub implementations.
 notsupp () { op=$1; echo >&2 "$quis: operation \`$op' not supported"; }
 k_info () { :; }
+k_import () { :; }
 k_encrypt () { notsupp encrypt; }
 k_decrypt () { notsupp decrypt; }
 k_sign () { notsupp sign; }
@@ -600,21 +612,23 @@ stash () {
 }
 
 recover () {
-  recov=$1 label=$2
+  recov=$1 inst=$2 label=$3
   ## Recover a stashed secret, protected by RECOV and stored as LABEL, and
   ## write it to stdout.
   checkword "recovery key label" "$recov"
+  checkword "recovery instance" "$inst"
   checklabel "secret" "$label"
 
-  rdir=$KEYS/recov/$recov/current
+  rdir=$KEYS/recov/$recov/$inst
   if [ ! -f $rdir/$label.recov ]; then
-    echo >&2 "$quis: no blob for \`$label' under recovery key \`$recov'"
+    echo >&2 "$quis: no blob for \`$label' under recovery key \`$recov/$inst'"
     exit 1
   fi
   reqsafe
-  nub=$SAFE/keys.reveal/$recov.current/nub
+  tag=$recov.$inst
+  nub=$SAFE/keys.reveal/$tag/nub
   if [ ! -f $nub ]; then
-    echo >&2 "$quis: current recovery key \`$recov' not revealed"
+    echo >&2 "$quis: current recovery key \`$recov/$inst' not revealed"
     exit 1;
   fi
   mktmp
@@ -626,7 +640,7 @@ recover () {
 
 defhelp () {
   read umsg
-  usage="usage: $quis${umsg+ }$umsg"
+  usage=$umsg
   help=$(cat)
   case "$KEYS_HELP" in t) help; exit ;; esac
 }
@@ -634,13 +648,17 @@ defhelp () {
 help () { showhelp; }
 showhelp () {
   cat <<EOF
-$usage
+Usage: $quis${usage:+ $usage}
 
 $help
 EOF
 }
 
-usage_err () { echo >&2 "$usage"; exit 1; }
+usage () {
+  : ${cmdargs=$usage}
+  echo "usage: $quis${cmdname:+ $cmdname}${cmdargs:+ $cmdargs}"
+}
+usage_err () { usage >&2; exit 1; }
 
 ###--------------------------------------------------------------------------
 ### Subcommand handling.
@@ -649,6 +667,20 @@ version () {
   echo "$PACKAGE version $VERSION"
 }
 
+unset cmdargs
+unset cmdname
+cmds=""
+defcmd () {
+  cmd=$1; shift; args=$*
+  help=$(cat)
+  eval help_$cmd=\$help
+  cmds="${cmds:+$cmds
+}$cmd $args"
+}
+
+defcmd help "[COMMAND ...]" <<EOF
+Show help about the COMMANDs, or about $quis if none are named.
+EOF
 cmd_help () {
   rc=0
   version
@@ -656,30 +688,50 @@ cmd_help () {
     0)
       cat <<EOF
 
-$usage
+Usage: $quis${usage:+ $usage}
 
 Options:
   -h		Show this help text.
   -v		Show the program version number.
 
-Commands installed:
+Commands provided:
 EOF
-      cd "$KEYSLIB"
-      for i in $prefix.*; do
-	if [ ! -x "$i" ]; then continue; fi
-	sed -n "/<<HELP/{n;s/^/	${i#$prefix.} /;p;q;}" "$i"
-      done
+      while read cmd args; do echo "	$cmd${args:+ $args}"; done <<EOF
+$cmds
+EOF
+      case ${prefix+t} in
+	t)
+	  cd $KEYSLIB
+	  for i in $prefix.*; do
+	    if [ ! -x "$i" ]; then continue; fi
+	    sed -n "/<<HELP/{n;s/^/	${i#$prefix.} /;p;q;}" "$i"
+	  done
+	  ;;
+      esac
       ;;
     *)
-      for i in "$@"; do
+      for cmd in "$@"; do
 	echo
-	if [ ! -x "$KEYSLIB/$prefix.$i" ]; then
-	  echo >&2 "$quis: unrecognized command \`$i'"
-	  rc=1
-	  continue
-	elif ! KEYS_HELP=t "$KEYSLIB/$prefix.$i"; then
-	  rc=1
-	fi
+	foundp=nil
+	while read cmdname cmdargs; do
+	  case $cmdname in "$cmd") foundp=t; break ;; esac
+	done <<EOF
+$cmds
+EOF
+	case $foundp in
+	  t)
+	    eval help=\$help_$cmdname; echo "$help"
+	    ;;
+	  nil)
+	    if [ ! -x "$KEYSLIB/$prefix.$cmd" ]; then
+	      echo >&2 "$quis: unrecognized command \`$cmd'"
+	      rc=1
+	      continue
+	    elif ! KEYS_HELP=t "$KEYSLIB/$prefix.$cmd"; then
+	      rc=1
+	    fi
+	    ;;
+	esac
       done
       ;;
   esac
@@ -687,16 +739,28 @@ EOF
 }
 
 dispatch () {
-  case $# in 0) echo >&2 "$usage"; exit 1 ;; esac
+  case $# in 0) usage_err ;; esac
   cmd=$1; shift
-  case "$cmd" in help) cmd_help "$@"; exit ;; esac
-  if [ ! -x "$KEYSLIB/$prefix.$cmd" ]; then
-    echo >&2 "$quis: unrecognized command \`$cmd'"
-    exit 1
-  fi
-
-  unset KEYS_HELP
-  exec "$KEYSLIB/$prefix.$cmd" "$@"
+  foundp=nil
+  while read cmdname cmdargs; do
+    case $cmdname in "$cmd") foundp=t; break ;; esac
+  done <<EOF
+$cmds
+EOF
+  case $foundp in
+    t)
+      OPTIND=1
+      cmd_$cmdname "$@"
+      ;;
+    nil)
+      if [ ! -x "$KEYSLIB/$prefix.$cmd" ]; then
+	echo >&2 "$quis: unrecognized command \`$cmd'"
+	exit 1
+      fi
+      unset KEYS_HELP
+      exec "$KEYSLIB/$prefix.$cmd" "$@"
+      ;;
+  esac
 }
 
 ###----- That's all, folks --------------------------------------------------