~mdw
/
distorted-keys
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cryptop.genkey: Fix lies in the help text.
[distorted-keys]
/
keys.reveal
diff --git
a/keys.reveal
b/keys.reveal
index
9270b55
..
c0b2a58
100755
(executable)
--- a/
keys.reveal
+++ b/
keys.reveal
@@
-51,12
+51,12
@@
checkword "recovery key" "$recov"
checkword "keeper set label" "$keeper"
## Check that this is a sensible thing to do.
checkword "keeper set label" "$keeper"
## Check that this is a sensible thing to do.
-kdir=$KEYS/keeper/$keeper
-if [ ! -f $kdir/meta ]; then
+k
eep
dir=$KEYS/keeper/$keeper
+if [ ! -f $k
eep
dir/meta ]; then
echo >&2 "$quis: unknown keeper set \`$keeper'"
exit 1
fi
echo >&2 "$quis: unknown keeper set \`$keeper'"
exit 1
fi
-if [ ! -
l
$KEYS/recov/$recov/current ]; then
+if [ ! -
h
$KEYS/recov/$recov/current ]; then
echo >&2 "$quis: unknown recovery key \`$recov'"
exit 1
fi
echo >&2 "$quis: unknown recovery key \`$recov'"
exit 1
fi
@@
-74,17
+74,17
@@
cat >$tmp/secret
t=$(sharethresh $rdir/$keeper.param)
## Find out which keeper index it corresponds to.
t=$(sharethresh $rdir/$keeper.param)
## Find out which keeper index it corresponds to.
-read n hunoz <$kdir/meta
+read n hunoz <$k
eep
dir/meta
i=0
i=0
-foundp=nil
+found
nub
p=nil
while [ $i -lt $n ]; do
while [ $i -lt $n ]; do
- c_sysprepare $kdir/$i
+ c_sysprepare $k
eep
dir/$i
nubbin=$(nubid <$tmp/secret)
nubbin=$(nubid <$tmp/secret)
- nubid=$(cat $kdir/$i/nubid)
- case "$nubbin" in "$nubid") foundp=t; break ;; esac
+ nubid=$(cat $k
eep
dir/$i/nubid)
+ case "$nubbin" in "$nubid") found
nub
p=t; break ;; esac
i=$(( $i + 1 ))
done
i=$(( $i + 1 ))
done
-case $foundp in
+case $found
nub
p in
nil) echo >&2 "$quis: nub doesn't match keeper \`$keeper'"; exit 1 ;;
esac
nil) echo >&2 "$quis: nub doesn't match keeper \`$keeper'"; exit 1 ;;
esac
@@
-106,7
+106,7
@@
umask 077
if [ -f $keeper.$i.share ]; then
echo >&2 "$quis: share $i already revealed"
else
if [ -f $keeper.$i.share ]; then
echo >&2 "$quis: share $i already revealed"
else
- c_sysdecrypt $kdir/$i $tmp/secret \
+ c_sysdecrypt $k
eep
dir/$i $tmp/secret \
<$rdir/$keeper.$i.share \
>$keeper.$i.new
mv $keeper.$i.new $keeper.$i.share
<$rdir/$keeper.$i.share \
>$keeper.$i.new
mv $keeper.$i.new $keeper.$i.share