diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-21 16:16:58 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-21 16:16:58 -0500 |
| commit | 6e371ad70b96003d50c769a2d2f6fd82c15d4bb5 (patch) | |
| tree | c6ab9826bc253733cfe9314a5a62e4d1be1f9bb7 | |
| parent | 0c052b77d171c1723cb371f7c414ff28bad1a7d3 (diff) | |
add tests to add_revoker and add_certifier that more than one key was not found when adding by using key ID.
| -rw-r--r-- | src/share/ma/add_certifier | 12 | ||||
| -rw-r--r-- | src/share/mh/add_revoker | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier index a48db64..eba6893 100644 --- a/src/share/ma/add_certifier +++ b/src/share/ma/add_certifier @@ -120,7 +120,17 @@ else # get the full fingerprint of new certifier key log debug "getting fingerprint of certifier key..." fingerprint=$(gpg_sphere "--list-key --with-colons --with-fingerprint 0x${keyID}!" \ - | grep '^fpr:' | grep "$keyID" | cut -d: -f10) + | grep '^fpr:' | cut -d: -f10) + + # test that there is only a single fingerprint + if (( $(echo "$fingerprint" | wc -l) != 1 )) ; then + cat <<EOF +More than one fingerprint found: + echo $fingerprint +Please use a more specific key ID. +EOF + failure + fi log info "key found:" gpg_sphere "--fingerprint 0x${fingerprint}!" diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker index 18ad2b7..50e8c67 100644 --- a/src/share/mh/add_revoker +++ b/src/share/mh/add_revoker @@ -74,7 +74,17 @@ else # get the full fingerprint of new revoker key log debug "getting fingerprint of revoker key..." fingerprint=$(su_monkeysphere_user "GNUPGHOME=$tmpDir gpg --list-key --with-colons --with-fingerprint 0x${keyID}!" \ - | grep '^fpr:' | grep "$keyID" | cut -d: -f10) + | grep '^fpr:' | cut -d: -f10) + + # test that there is only a single fingerprint + if (( $(echo "$fingerprint" | wc -l) != 1 )) ; then + cat <<EOF +More than one fingerprint found: + echo $fingerprint +Please use a more specific key ID. +EOF + failure + fi log info "key found:" su_monkeysphere_user "GNUPGHOME=$tmpDir gpg --fingerprint 0x${fingerprint}!" |