From 523e8eb3680633d6929630764a1e28e69bacecf1 Mon Sep 17 00:00:00 2001 From: Jameson Rollins Date: Thu, 30 Dec 2010 12:47:05 -0500 Subject: [PATCH] Allow for '0x' prefix to openpgp4fpr Modify the regexp check of the data to return everything after a '0x' instance as the fingerprint. --- Crypt/Monkeysphere/MSVA.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Crypt/Monkeysphere/MSVA.pm b/Crypt/Monkeysphere/MSVA.pm index c9a4cd6..e377808 100755 --- a/Crypt/Monkeysphere/MSVA.pm +++ b/Crypt/Monkeysphere/MSVA.pm @@ -711,8 +711,8 @@ my $key; my $gpgquery; if (lc($data->{pkc}->{type}) eq 'openpgp4fpr') { - if ($data->{pkc}->{data} =~ /^([[:xdigit:]]+)$/) { - $data->{pkc}->{data} = $1; + if ($data->{pkc}->{data} =~ /^(0x)?([[:xdigit:]]+)$/) { + $data->{pkc}->{data} = $2; $fpr = $data->{pkc}->{data}; msvalog('verbose', "OpenPGP v4 fingerprint: %s\n",$fpr); } else { -- 2.26.2