===================================================================
RCS file: /cvs/palm/Palm-Keyring/lib/Palm/Keyring.pm,v
retrieving revision 1.50
retrieving revision 1.55
diff -u -r1.50 -r1.55
--- palm/Palm-Keyring/lib/Palm/Keyring.pm	2007/09/13 01:02:52	1.50
+++ palm/Palm-Keyring/lib/Palm/Keyring.pm	2008/09/17 15:47:47	1.55
@@ -1,5 +1,5 @@
 package Palm::Keyring;
-# $RedRiver: Keyring.pm,v 1.49 2007/09/12 03:39:22 andrew Exp $
+# $RedRiver: Keyring.pm,v 1.54 2007/12/05 05:42:29 andrew Exp $
 ########################################################################
 # Keyring.pm *** Perl class for Keyring for Palm OS databases.
 #
@@ -15,6 +15,8 @@
 use strict;
 use warnings;
 
+require 5.006_001;
+
 use Carp;
 
 use base qw/ Palm::StdAppInfo /;
@@ -83,7 +85,7 @@
 );
 
 
-our $VERSION = '0.96_04';
+our $VERSION = '0.96_07';
 
 sub new 
 {
@@ -631,8 +633,10 @@
 
     my $plaintext;
     foreach my $k (keys %{ $new }) {
+        next if $new->{$k}->{label_id} == 0;
         $plaintext .= _pack_field($new->{$k});
     }
+    $plaintext .= chr(0xff) x 2;
 
     my $encrypted;
     if ($c->{name} eq 'None') {
@@ -1176,7 +1180,7 @@
 
     my ($len) = unpack "n", $field;
     if ($len + 4 > length $field) {
-        return undef, $field;
+        return (undef, $field);
     }
     my $unpackstr = "x2 C1 C1 A$len";
     my $offset    =   2 +1 +1 +$len;
@@ -1285,6 +1289,8 @@
     my $maxlines = shift; # Max # of lines to dump
     my $offset;           # Offset of current chunk
 
+    my @lines;
+
     for ($offset = 0; $offset < length($data); $offset += 16)
     {
         my $hex;   # Hex values of the data
@@ -1299,8 +1305,9 @@
 
         ($ascii = $chunk) =~ y/\040-\176/./c;
 
-        printf "%s %-48s|%-16s|\n", $prefix, $hex, $ascii;
+        push @lines, sprintf "%s %-48s|%-16s|\n", $prefix, $hex, $ascii;
     }
+    return wantarray ? @lines : \@lines;
 }
 
 sub _bindump
@@ -1310,6 +1317,8 @@
     my $maxlines = shift; # Max # of lines to dump
     my $offset;           # Offset of current chunk
 
+    my @lines;
+
     for ($offset = 0; $offset < length($data); $offset += 8)
     {
         my $bin;   # binary values of the data
@@ -1324,8 +1333,9 @@
 
         ($ascii = $chunk) =~ y/\040-\176/./c;
 
-        printf "%s %-72s|%-8s|\n", $prefix, $bin, $ascii;
+        push @lines, sprintf "%s %-72s|%-8s|\n", $prefix, $bin, $ascii;
     }
+    return wantarray ? @lines : \@lines;
 }
 
 # Thanks to Jochen Hoenicke <hoenicke@gmail.com> 
@@ -1337,7 +1347,7 @@
 # keylen is length of generated key in bytes
 # prf is the pseudo random function (e.g. hmac_sha1)
 # returns the key.
-sub _pbkdf2($$$$$)
+sub _pbkdf2
 {
     my ($password, $salt, $iter, $keylen, $prf) = @_;
     my ($k, $t, $u, $ui, $i);
@@ -1353,7 +1363,7 @@
     return substr($t, 0, $keylen);
 }
 
-sub _DES_odd_parity($) {
+sub _DES_odd_parity {
     my $key = $_[0];
     my ($r, $i);
     my @odd_parity = (