From f0a31d3c23e58ace0d3b75e34cc34f7a0af65e8e Mon Sep 17 00:00:00 2001
From: ADAM David Alan Martin <adam@recursive.engineer>
Date: Tue, 3 Feb 2026 13:59:14 -0500
Subject: [PATCH] One password, but it's destructive.

---
 gen-and-distrib-new-key.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gen-and-distrib-new-key.sh b/gen-and-distrib-new-key.sh
index 270c2b1..ba45bdc 100755
--- a/gen-and-distrib-new-key.sh
+++ b/gen-and-distrib-new-key.sh
@@ -32,10 +32,14 @@ mkdir -p ~/.ssh/newkeys
 #echo rm -f ${keyname}
 rm -f ~/.ssh/newkeys/${keyname}
 
-ssh-keygen -t ${keytype} -b ${keybits} -V +6w -f ~/.ssh/newkeys/${keyname}
+ssh-keygen -N "" -t ${keytype} -b ${keybits} -V +6w -f ~/.ssh/newkeys/${keyname}
 
-ssh ${target} "mkdir -p .ssh/incoming; rm -f .ssh/incoming/${keyname}" || exit
-scp ~/.ssh/newkeys/${keyname}.pub ${target}:.ssh/incoming/id_${hostname}.pub || exit
+# NOTE: THIS STEP IS DESTRUCTIVE!  IT WILL OBLITERATE YOUR AUTHORIZED KEYS
+# THE NEXT STEPS MUST RUN TO RESTORE THEM!!!!
+scp ~/.ssh/newkeys/${keyname}.pub ${target}:.ssh/authorized_keys || exit
+
+ssh -i ~/.ssh/newkeys/${keyname} ${target} "mkdir -p .ssh/incoming; rm -f .ssh/incoming/${keyname}" || exit
+scp -i ~/.ssh/newkeys/${keyname} ~/.ssh/newkeys/${keyname}.pub ${target}:.ssh/incoming/id_${hostname}.pub || exit
 rm ~/.ssh/newkeys/${keyname}.pub
-ssh ${target} "mkdir -p .ssh/valid; mv .ssh/incoming/id_${hostname}.pub .ssh/valid; cat .ssh/valid/* > .ssh/authorized_keys" || exit
+ssh -i ~/.ssh/newkeys/${keyname} ${target} "mkdir -p .ssh/valid; mv .ssh/incoming/id_${hostname}.pub .ssh/valid; cat .ssh/valid/* > .ssh/authorized_keys" || exit
 mv ~/.ssh/newkeys/${keyname} ~/.ssh/${keyname}