projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests/basic now tests for adding and revoking hostnames.
[monkeysphere.git]
/
src
/
share
/
mh
/
revoke_key
diff --git
a/src/share/mh/revoke_key
b/src/share/mh/revoke_key
index 271432b279f4dadbb8c9b20fea741265d757ab3b..5460e51b182c05faaabd2180d4ef06814a678096 100644
(file)
--- a/
src/share/mh/revoke_key
+++ b/
src/share/mh/revoke_key
@@
-33,7
+33,8
@@
Publishing this certificate will IMMEDIATELY and PERMANENTLY revoke
your host key!
EOF
your host key!
EOF
- read -p "Publish the certificate after generation? (y/n/Q) " publish
+ printf "Publish the certificate after generation? (y/n/Q) " >&2
+ read publish
if ! [ "${publish/y/Y}" = 'Y' -o "${publish/n/N}" = 'N' ] ; then
failure "aborting at user request"
if ! [ "${publish/y/Y}" = 'Y' -o "${publish/n/N}" = 'N' ] ; then
failure "aborting at user request"
@@
-53,9
+54,13
@@
EOF
# certificate immediately, which we can help them do as well.
if [ "$PROMPT" = 'false' ] ; then
# certificate immediately, which we can help them do as well.
if [ "$PROMPT" = 'false' ] ; then
+ # FIXME: allow the end user to choose something other than
+ # "key was compromised" (1) and to supply their own revocation
+ # string.
+
local revoke_commands="y
1
local revoke_commands="y
1
-Monkeysphere host key revocation (
no prompting) $(date '+%F_%T
')
+Monkeysphere host key revocation (
automated) $(date '+%F_%T%z
')
y
y
@@
-83,7
+88,8
@@
y
if [ "${publish/y/Y}" = 'Y' ] ; then
printf "\n" >&2
if [ "${publish/y/Y}" = 'Y' ] ; then
printf "\n" >&2
- read -p "Really publish this cert to $KEYSERVER ? (Y/n) " really
+ printf "Really publish this cert to $KEYSERVER ? (Y/n) " >&2
+ read really
if [ "${really/n/N}" = 'N' ] ; then
printf "Not publishing.\n" >&2
else
if [ "${really/n/N}" = 'N' ] ; then
printf "Not publishing.\n" >&2
else