[Pgp-tools-commit] r127 - trunk/caff

[Peter Palfrader]

Author: weasel
Date: 2005-07-13 14:16:42 +0000 (Wed, 13 Jul 2005)
New Revision: 127

Modified:
   trunk/caff/caff
Log:
More input validation fixes.  Thanks jon at aslund.org

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2005-07-11 11:49:26 UTC (rev 126)
+++ trunk/caff/caff	2005-07-13 14:16:42 UTC (rev 127)
@@ -715,7 +715,7 @@
 if ($params->{'local-user'}) {
 	$USER = $params->{'local-user'};
 	$USER =~ s/^0x//i;
-	unless ($USER =~ /^([A-Z0-9]{8}|[A-Z0-9]{16}|[A-Z0-9]{40})$/i) {
+	unless ($USER =~ /^([A-F0-9]{8}|[A-F0-9]{16}|[A-F0-9]{40})$/i) {
 		print STDERR "-u $USER is not a keyid.\n";
 		usage(\*STDERR, 1);
 	};
@@ -724,7 +724,7 @@
 
 for my $keyid (@ARGV) {
 	$keyid =~ s/^0x//i;
-	unless ($keyid =~ /^([A-Z0-9]{8}|[A-Z0-9]{16}||[A-Z0-9]{40})$/i) {
+	unless ($keyid =~ /^([A-F0-9]{8}|[A-F0-9]{16}||[A-F0-9]{40})$/i) {
 		print STDERR "$keyid is not a keyid.\n";
 		usage(\*STDERR, 1);
 	};