projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d06d6df
)
fix the publish_key function for new gpg_sphere.
author
Jameson Graef Rollins
<jrollins@finestructure.net>
Mon, 16 Feb 2009 03:51:17 +0000
(22:51 -0500)
committer
Jameson Graef Rollins
<jrollins@finestructure.net>
Mon, 16 Feb 2009 03:51:17 +0000
(22:51 -0500)
etc/monkeysphere-authentication.conf
patch
|
blob
|
history
etc/monkeysphere.conf
patch
|
blob
|
history
packaging/debian/changelog
patch
|
blob
|
history
src/share/mh/publish_key
patch
|
blob
|
history
diff --git
a/etc/monkeysphere-authentication.conf
b/etc/monkeysphere-authentication.conf
index ea40966168046f82a277733932b0ceac84ca77ff..0a28c4d6c0aa80bf3e96eff808afaf853b7fd346 100644
(file)
--- a/
etc/monkeysphere-authentication.conf
+++ b/
etc/monkeysphere-authentication.conf
@@
-28,4
+28,4
@@
# by the home directory of the user, and '%u' will by replaced by the
# username of the user. Setting this variable to 'none' prevents the
# inclusion of user controlled authorized_keys file.
# by the home directory of the user, and '%u' will by replaced by the
# username of the user. Setting this variable to 'none' prevents the
# inclusion of user controlled authorized_keys file.
-#
RAW_AUTHORIZED_KEYS="%h/.ssh/authorized_keys"
+#RAW_AUTHORIZED_KEYS="%h/.ssh/authorized_keys"
diff --git
a/etc/monkeysphere.conf
b/etc/monkeysphere.conf
index 2f0b877a1ba772471b9d8650b2dbcb3b31140c7f..20df62bddc944b2cdbb67ac43bcbdd9907f6c119 100644
(file)
--- a/
etc/monkeysphere.conf
+++ b/
etc/monkeysphere.conf
@@
-14,7
+14,7
@@
# MONKEYSPHERE_GNUPGHOME environment variable, then the value of the
# GNUPGHOME environment variable will be used. If GNUPGHOME is not
# set either, then the default value is listed below.
# MONKEYSPHERE_GNUPGHOME environment variable, then the value of the
# GNUPGHOME environment variable will be used. If GNUPGHOME is not
# set either, then the default value is listed below.
-#
GNUPGHOME=~/.gnupg
+#GNUPGHOME=~/.gnupg
# GPG keyserver to search for keys.
#KEYSERVER=pool.sks-keyservers.net
# GPG keyserver to search for keys.
#KEYSERVER=pool.sks-keyservers.net
diff --git
a/packaging/debian/changelog
b/packaging/debian/changelog
index 6b31e1633b57032fb4a8af8a032f0c2af0df35d4..c825b646d95c41a80ed12e60aaec522db97f8e3c 100644
(file)
--- a/
packaging/debian/changelog
+++ b/
packaging/debian/changelog
@@
-7,6
+7,7
@@
monkeysphere (0.23~pre-1) UNRELEASED; urgency=low
- replace monkeysphere-server with monkeysphere-{authentication,host}
- fold monkeysphere-ssh-proxycommand into /usr/bin/monkeysphere
- replace monkeysphere-server with monkeysphere-{authentication,host}
- fold monkeysphere-ssh-proxycommand into /usr/bin/monkeysphere
+ * new ability to import existing ssh key into monkeysphere
* simplify adding a host to the monkeysphere, automate the process
during debian installation
* provide pem2openpgp for translating unencrypted PEM-encoded raw key
* simplify adding a host to the monkeysphere, automate the process
during debian installation
* provide pem2openpgp for translating unencrypted PEM-encoded raw key
@@
-18,7
+19,7
@@
monkeysphere (0.23~pre-1) UNRELEASED; urgency=low
* check that existing authentication keys are valid in gen_key
function.
* check that existing authentication keys are valid in gen_key
function.
- --
Daniel Kahn Gillmor <dkg@pip.fifthhorseman.net> Sat, 31 Jan 2009 17:32:58
-0500
+ --
Jameson Graef Rollins <jrollins@finestructure.net> Thu, 12 Feb 2009 21:50:54
-0500
monkeysphere (0.22-1) unstable; urgency=low
monkeysphere (0.22-1) unstable; urgency=low
diff --git
a/src/share/mh/publish_key
b/src/share/mh/publish_key
index 988b4503ed18113fbb81ba6a9a9542d842ac842b..600dfcf585d2d1122a708ea3b202bf46145db9e9 100644
(file)
--- a/
src/share/mh/publish_key
+++ b/
src/share/mh/publish_key
@@
-20,12
+20,7
@@
if [ ${OK/y/Y} != 'Y' ] ; then
failure "key not published."
fi
failure "key not published."
fi
-# find the key fingerprint
-fingerprint=$(fingerprint_host_key)
-
# publish host key
# publish host key
-# FIXME: need to define how to do this
-#gpg_authentication "--keyserver $KEYSERVER --send-keys '0x${fingerprint}!'"
-echo "not published!!!"
+gpg_sphere "--keyserver $KEYSERVER --send-keys '0x${HOST_FINGERPRINT}!'"
}
}