From 5c30c6e62b52a66d5c5f33a6adb81bb882e88339 Mon Sep 17 00:00:00 2001 Message-Id: <5c30c6e62b52a66d5c5f33a6adb81bb882e88339.1715283066.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 25 Dec 2011 23:49:44 +0000 Subject: [PATCH] keys.new-recov, keys.reveal, keyfunc.sh.in: Don't put @bindir@ on the PATH. Organization: Straylight/Edgeware From: Mark Wooding Call `shamir' using an explicit pathname instead. --- keyfunc.sh.in | 2 -- keys.new-recov | 2 +- keys.reveal | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/keyfunc.sh.in b/keyfunc.sh.in index bfcb26b..44117e9 100644 --- a/keyfunc.sh.in +++ b/keyfunc.sh.in @@ -31,8 +31,6 @@ quis=${0##*/} PACKAGE="@PACKAGE@" VERSION="@VERSION@" bindir="@bindir@" -case ":$PATH:" in *:"$bindir":*) ;; *) PATH=$bindir:$PATH ;; esac - if [ -f $ETC/keys.conf ]; then . $ETC/keys.conf; fi case "${KEYS_DEBUG+t}" in t) set -x ;; esac diff --git a/keys.new-recov b/keys.new-recov index c5d7fce..08c4ce3 100755 --- a/keys.new-recov +++ b/keys.new-recov @@ -102,7 +102,7 @@ done c_gensyskey $profile $rdir/new/store secret recov="$recov" while read keeper k; do read n hunoz <$KEYS/keeper/$keeper/meta - shamir issue $k/$n secret | { + $bindir/shamir issue $k/$n secret | { read param echo "$param" >$rdir/new/$keeper.param i=0 diff --git a/keys.reveal b/keys.reveal index a93ec90..a1c0242 100755 --- a/keys.reveal +++ b/keys.reveal @@ -133,7 +133,7 @@ if [ $n -lt $t ]; then echo >&2 "$quis: share $i revealed; $(( $t - $n )) more required" else cat $KEYS/recov/$recov/$keeper.param $keeper.*.share >$keeper.shares - shamir recover <$keeper.shares >nub.new + $bindir/shamir recover <$keeper.shares >nub.new c_sysprepare $KEYS/recov/$recov/store nubbin=$(nubid