keyfunc.sh.in, ktype.*: Make nub creation the job of `c_genkey'.

This means that we can stop worrying about the permissions on the file,
and the duplicated calls to `makenub' can disappear.

diff --git a/keyfunc.sh.in b/keyfunc.sh.in
index f257bb93bc65545ae40e1800f6b8954dbfc1151c..c8a60738c5970c92cbd61a605eb8bf1521550f2f 100644 (file)
--- a/keyfunc.sh.in
+++ b/keyfunc.sh.in
@@ -437,7 +437,7 @@ $profile
 EOF
 
   ## Generate the key.
 EOF
 
   ## Generate the key.

-  umask=$(umask); umask 077; >"$knub.new"; umask $umask
+  (umask 077; makenub >"$knub.new")

   k_generate "$kdir.new" "$knub.new"
   $hook "$kdir.new" "$knub.new"
 
   k_generate "$kdir.new" "$knub.new"
   $hook "$kdir.new" "$knub.new"
 

diff --git a/ktype.gnupg b/ktype.gnupg
index 18a17a9ec84ea2edeaea842e27617efe16732fad..c24492f1df8ee12f4308851c1ef432ef0179c13f 100644 (file)
--- a/ktype.gnupg
+++ b/ktype.gnupg
@@ -91,7 +91,6 @@ EOF
 k_generate () {
   base=$1 nub=$2
 
 k_generate () {
   base=$1 nub=$2
 

-  makenub >"$nub"

   initdir "$base"
 
   { cat <<EOF
   initdir "$base"
 
   { cat <<EOF

diff --git a/ktype.seccure b/ktype.seccure
index da51687a26b0f71251564bc5e3ffe4d1797246c2..e884453739654d23d197de53bc24fd452596bdf1 100644 (file)
--- a/ktype.seccure
+++ b/ktype.seccure
@@ -56,7 +56,6 @@ k_public () {
 
 k_generate () {
   base=$1 nub=$2
 
 k_generate () {
   base=$1 nub=$2

-  makenub >"$nub"

   k_public "$base" "$nub" >"$base/pub"
 }
 
   k_public "$base" "$nub" >"$base/pub"
 }