X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=keylookup%2Fkeylookup;h=a69f888ec8857a0eea50a2f0e9c3c14abd194b80;hb=1dbf3a783109683aa49a5d42e5fd07da1d286609;hp=44fae86d1999b5a60f1f71e47e336975d2bf062e;hpb=368eff81b5ad3edb6d636f11a4573f83d8747fec;p=pgp-tools.git

diff --git a/keylookup/keylookup b/keylookup/keylookup
index 44fae86..a69f888 100755
--- a/keylookup/keylookup
+++ b/keylookup/keylookup
@@ -17,14 +17,14 @@
 #
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
 # Keylookup is part of pgp-tools:
 #           http://pgp-tools.alioth.debian.org/
 #           svn://svn.debian.org/pgp-tools/trunk/
 #           http://svn.debian.org/wsvn/pgp-tools/trunk/
 
-delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV', 'PATH'};
+delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
 $|=1; # Always flush buffers
 
 
@@ -35,11 +35,6 @@ use Getopt::Long;
 
 my $version = '3.0 ($Id$)';
 
-# Where to find GnuPG's options file.
-# Full path to the dialog and whiptail executeable.
-my $Dialog = '/usr/bin/dialog';
-my $Whiptail = '/usr/bin/whiptail';
-
 # Strings to use in the dialog|whiptail frontend
 my $TITLE = 'Import Keys';
 my $BACKTITLE = 'KeyLookup $Revision$';
@@ -104,6 +99,7 @@ sub getHits($) {
 
 	while (<KID>) {
 		chomp;
+		if ( $_ eq "" ) { next; }
 		my ($type, undef) = split /:/;
 		if ($type eq 'pub') {
 			my ($type, $keyid, $algo, $bits, $created, undef, $revoked) = split /:/;
@@ -214,7 +210,8 @@ sub callDialog {
 	
 	my %unique;
 	my @keys = grep { !$unique{$_}++ }
-		grep { /^[0-9A-Fa-f]{8}$/ }
+		# get the keyID; can be 8, 16 or 40 nibbles
+		grep { /^((([a-zA-Z0-9]{24})?[a-zA-Z0-9]{8})?[a-zA-Z0-9]{8})$/ }
 		map { s/\s//g; $_ } <ERRFH>;
 	wait;
 
@@ -232,14 +229,14 @@ sub selectKeys {
 	$frontend = 'dialog' unless (defined $frontend);
 
 	if ($frontend eq 'dialog') {
-		unless (-x $Dialog) {
-			warn("Dialog ($Dialog) not executeable/installed. Falling back to Whiptail\n");
+		unless (`which dialog` && $? == 0) {
+			warn("Dialog not executeable/installed. Falling back to Whiptail\n");
 			$frontend = 'whiptail';
 		}
 	};
 	if ($frontend eq 'whiptail') {
-		unless (-x $Whiptail ) {
-			warn("Whiptail ($Whiptail) not executeable/installed. Falling back to plain\n");
+		unless (`which whiptail` && $? == 0 ) {
+			warn("Whiptail not executeable/installed. Falling back to plain\n");
 			$frontend = 'plain';
 		}
 	};
@@ -247,7 +244,7 @@ sub selectKeys {
 	if ( $frontend eq 'dialog' ) {
 		calcDialogSize;
 		my @ARGS = (
-			$Dialog,
+			'dialog',
 			'--backtitle',
 			$BACKTITLE,
 			'--separate-output',
@@ -261,7 +258,7 @@ sub selectKeys {
 	} elsif ( $frontend eq 'whiptail' ) {
 		calcDialogSize;
 		my @ARGS = (
-			$Whiptail,
+			'whiptail',
 			'--backtitle',
 			$BACKTITLE,
 			'--separate-output',
@@ -300,7 +297,7 @@ sub importKeys {
 	push @args,  '--recv-keys';
 	for my $keyid (@$keyids) {
 		# untaint keyids
-		my ($cleanid) = $keyid =~ /^([a-zA-Z0-9]{8})$/;
+		my ($cleanid) = $keyid =~ /^((([a-zA-Z0-9]{24})?[a-zA-Z0-9]{8})?[a-zA-Z0-9]{8})$/;
 		warn ("keyid '$keyid' has unexpected format - skipping\n"), next
 			unless defined $cleanid;
 		push @args, $cleanid;