X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-keys/blobdiff_plain/68023101ab409d775673edadb77079a7adf50374..5c30c6e62b52a66d5c5f33a6adb81bb882e88339:/keyfunc.sh.in

diff --git a/keyfunc.sh.in b/keyfunc.sh.in
index 82ed9e5..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
@@ -227,9 +225,9 @@ defprops g_props <<EOF
 type			nil	$R_IDENT
 recovery		t	$R_WORDSEQ
 random			t	$R_WORD
-nubhash			t	$R_WORD
-nubidhash		t	$R_WORD
-nubsz			t	$R_NUMERIC
+nub_hash		t	$R_WORD
+nubid_hash		t	$R_WORD
+nub_random_bytes	t	$R_NUMERIC
 EOF
 
 readprops () {
@@ -265,20 +263,21 @@ readmeta () {
 
 makenub () {
   ## Generate a key nub in the default way, and write it to standard output.
-  ## The properties `random', `nubsz' and `nubhash' are referred to.
+  ## The properties `random', `nub_random_bytes' and `nub_hash' are referred
+  ## to.
 
   dd 2>/dev/null \
-    if=/dev/${kprop_random-random} bs=1 count=${kprop_nubsz-512} |
-  openssl dgst -${kprop_nubhash-sha384} -binary |
+    if=/dev/${kprop_random-random} bs=1 count=${kprop_nub_random_bytes-64} |
+  openssl dgst -${kprop_nub_hash-sha256} -binary |
   openssl base64
 }
 
 nubid () {
   ## Compute a hash of the key nub in stdin, and write it to stdout in hex.
-  ## The property `nubidhash' is used.
+  ## The property `nubid_hash' is used.
 
   { echo "distorted-keys nubid"; cat -; } |
-  openssl dgst -${kprop_nubidhash-sha256}
+  openssl dgst -${kprop_nubid_hash-sha256}
 }
 
 subst () {