Allow for '0x' prefix to openpgp4fpr

Modify the regexp check of the data to return everything after a
'0x' instance as the fingerprint.

diff --git a/Crypt/Monkeysphere/MSVA.pm b/Crypt/Monkeysphere/MSVA.pm
index c9a4cd66171cca83f962159393bfc41c7a226072..e377808c2c6cc6ead71f26d6e15180a111d332fc 100755 (executable)
--- 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 {