X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fcommon;h=cabc378f05729bf29e673ee0499bca55d4911748;hb=598dcc966aa985361102fc8816aaf70dfb6b17d7;hp=0a7fe87c862585928b7cb6b066b482eb044300aa;hpb=8b806ee99239d48fd3c2920c19f5cac7d54d2e8d;p=monkeysphere.git

diff --git a/src/share/common b/src/share/common
index 0a7fe87..cabc378 100644
--- a/src/share/common
+++ b/src/share/common
@@ -478,7 +478,7 @@ gpg2ssh() {
     
     keyID="$1"
 
-    gpg --export "$keyID" | openpgp2ssh "$keyID" 2>/dev/null
+    gpg --export --no-armor "$keyID" | openpgp2ssh "$keyID" 2>/dev/null
 }
 
 # output known_hosts line from ssh key
@@ -581,6 +581,10 @@ gpg_fetch_userid() {
 	--search ="$userID" &>/dev/null
     returnCode="$?"
 
+    if [ "$returnCode" != 0 ] ; then
+        log error "Failure ($returnCode) searching keyserver $KEYSERVER for user id '$userID'"
+    fi
+
     return "$returnCode"
 }
 
@@ -1200,13 +1204,25 @@ process_authorized_user_ids() {
 list_primary_fingerprints() {
     local fake=$(msmktempdir)
     trap "rm -rf $fake" EXIT
-    GNUPGHOME="$fake" gpg --no-tty --quiet --import
+    GNUPGHOME="$fake" gpg --no-tty --quiet --import --ignore-time-conflict 2>/dev/null
     GNUPGHOME="$fake" gpg --with-colons --fingerprint --list-keys | \
 	awk -F: '/^fpr:/{ print $10 }'
     trap - EXIT
     rm -rf "$fake"
 }
 
+# takes an OpenPGP key or set of keys on stdin, a fingerprint or other
+# key identifier as $1, and outputs the gpg-formatted information for
+# the requested keys from the material on stdin
+get_cert_info() {
+    local fake=$(msmktempdir)
+    trap "rm -rf $fake" EXIT
+    GNUPGHOME="$fake" gpg --no-tty --quiet --import --ignore-time-conflict 2>/dev/null
+    GNUPGHOME="$fake" gpg --with-colons --fingerprint --fixed-list-mode --list-keys "$1"
+    trap - EXIT
+    rm -rf "$fake"
+}
+
 
 check_cruft_file() {
     local loc="$1"