keyfunc.sh.in: Rename the nub computation properties.

These names are more consistent with the longer names used elsewhere.

diff --git a/keyfunc.sh.in b/keyfunc.sh.in
index 82ed9e5f37a58f859568e0f18941330722408162..bfcb26b404da65f043b51c047e644db2bda9e19e 100644 (file)
--- a/keyfunc.sh.in
+++ b/keyfunc.sh.in
@@ -227,9 +227,9 @@ defprops g_props <<EOF
 type                   nil     $R_IDENT
 recovery               t       $R_WORDSEQ
 random                 t       $R_WORD
 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 () {
 EOF
 
 readprops () {


@@ -265,20 +265,21 @@ readmeta () {
 
 makenub () {
   ## Generate a key nub in the default way, and write it to standard output.
 
 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 \
 
   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.
   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 -; } |
 
   { echo "distorted-keys nubid"; cat -; } |

-  openssl dgst -${kprop_nubidhash-sha256}
+  openssl dgst -${kprop_nubid_hash-sha256}

 }
 
 subst () {
 }
 
 subst () {