===================================================================
RCS file: /cvs/palm/Palm-Keyring/lib/Palm/Keyring.pm,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- palm/Palm-Keyring/lib/Palm/Keyring.pm	2007/02/22 05:16:04	1.36
+++ palm/Palm-Keyring/lib/Palm/Keyring.pm	2007/02/23 02:34:01	1.37
@@ -1,5 +1,5 @@
 package Palm::Keyring;
-# $RedRiver: Keyring.pm,v 1.35 2007/02/22 04:11:35 andrew Exp $
+# $RedRiver: Keyring.pm,v 1.36 2007/02/22 05:16:04 andrew Exp $
 ########################################################################
 # Keyring.pm *** Perl class for Keyring for Palm OS databases.
 #
@@ -16,7 +16,6 @@
 use warnings;
 
 use Carp;
-$Carp::Verbose = 1;
 
 use base qw/ Palm::StdAppInfo /;
 
@@ -169,13 +168,11 @@
     } elsif ($self->{version} == 5) {
         my $blocksize = $CRYPTS[ $self->{appinfo}->{cipher} ]{blocksize};
         my ($field, $extra) = _parse_field($rec->{data});
-        my $ivec      = substr $extra, 0, $blocksize;
-        my $encrypted = substr $extra, $blocksize;
+        delete $rec->{data};
 
         $rec->{name}      = $field->{data};
-        $rec->{ivec}      = $ivec;
-        $rec->{encrypted} = $encrypted;
-        delete $rec->{data};
+        $rec->{ivec}      = substr $extra, 0, $blocksize;
+        $rec->{encrypted} = substr $extra, $blocksize;
 
     } else {
         die 'Unsupported Version';
@@ -203,12 +200,21 @@
         }
 
     } elsif ($self->{version} == 5) {
-        my $field = {
-            'label_id' => 1,
-            'data'     => $rec->{name},
-            'font'     => 0,
-        };
-        my $packed .= _pack_field($field);
+        my $field;
+        if ($rec->{name}) {
+            $field = {
+                'label_id' => 1,
+                'data'     => $rec->{name},
+                'font'     => 0,
+            };
+        } else {
+            $field = {
+                'label_id' => $EMPTY,
+                'data'     => $EMPTY,
+                'font'     => 0,
+            };
+        }
+        my $packed = _pack_field($field);
 
         $rec->{data} = join '', $packed, $rec->{ivec}, $rec->{encrypted};
 
@@ -495,18 +501,17 @@
     my $date_index;
     for (my $i = 0; $i < @{ $new }; $i++) {
         if (
-            (exists $new->[$i]->{label_id} && $new->[$i]->{label_id} == 3) ||
-            (exists $new->[$i]->{label}    && $new->[$i]->{label}    eq 'lastchange')
+            ($new->[$i]->{label_id} && $new->[$i]->{label_id} == 3) ||
+            ($new->[$i]->{label} && $new->[$i]->{label} eq 'lastchange')
         ) {
             $date_index   = $i;
             if ( $old && $#{ $new } == $#{ $old } && (
-                    $new->[$i]->{data}->{day}   != $old->[$i]->{data}->{day}   ||
-                    $new->[$i]->{data}->{month} != $old->[$i]->{data}->{month} ||
-                    $new->[$i]->{data}->{year}  != $old->[$i]->{data}->{year}
+                    $new->[$i]{data}{day}   != $old->[$i]{data}{day}   ||
+                    $new->[$i]{data}{month} != $old->[$i]{data}{month} ||
+                    $new->[$i]{data}{year}  != $old->[$i]{data}{year}
                 )) {
                 $changed      = 1;
                 $need_newdate = 0;
-                last;
             }
 
         } elsif ($old && $#{ $new } == $#{ $old }) {
@@ -1077,7 +1082,7 @@
     my ($label, $font, $data) = unpack $unpackstr, $field;
     my $leftover = substr $field, $offset;
 
-    if ($label == 3) {
+    if ($label && $label == 3) {
         $data = _parse_keyring_date($data);
     }
     return {
@@ -1101,21 +1106,30 @@
         notes      => 255,
     );
 
-    my $label = $field->{label_id} || $labels{ $field->{label} };
-    my $font  = $field->{font}     || 0;
-    my $data  = $field->{data}     || '';
+    my $packed;
+    if (defined $field) {
+        my $label = $field->{label_id} || 0;
+        if (defined $field->{label} && ! $label) {
+            $label = $labels{ $field->{label} };
+        }
+        my $font  = $field->{font} || 0;
+        my $data  = defined $field->{data} ? $field->{data} : $EMPTY;
 
-    if ($label == 3) {
-        $data = _pack_keyring_date($data);
-    }
-    my $len = length $data;
-    my $packstr = "n1 C1 C1 A*";
+        if ($label && $label == 3) {
+            $data = _pack_keyring_date($data);
+        }
+        my $len = length $data;
+        my $packstr = "n1 C1 C1 A*";
 
-    my $packed = pack $packstr, ($len, $label, $font, $data);
+        $packed = pack $packstr, ($len, $label, $font, $data);
 
-    if ($len % 2) {
-        # add byte padding for next even address.
-        $packed .= $NULL;
+        if ($len % 2) {
+            # add byte padding for next even address.
+            $packed .= $NULL;
+        }
+    } else {
+        my $packstr = "n1 c1 c1 x1";
+        $packed = pack $packstr, 0, 0, 0;
     }
 
     return $packed;
@@ -1267,9 +1281,10 @@
 It has the standard Palm::PDB methods with 2 additional public methods.  
 Decrypt and Encrypt.
 
-It currently supports the v4 Keyring databases.  
-The pre-release v5 databases are mostly supported.  There are definitely some 
-bugs,  For example, t/keyring5.t sometimes fails.  I am not sure why yet.
+It currently supports the v4 Keyring databases as well as
+the pre-release v5 databases.  I am not completely happy with the interface
+for accessing the v5 database, so any suggestions on improvements on 
+the interface are appreciated.
 
 This module doesn't store the decrypted content.  It only keeps it until it 
 returns it to you or encrypts it.
@@ -1289,7 +1304,18 @@
         next if $_ == 0 && $pdb->{version} == 4;
         my $rec  = $pdb->{records}->[$_];
         my $acct = $pdb->Decrypt($rec, $pass);
-        print $rec->{name}, ' - ', $acct->{account}, "\n";
+        print $rec->{name}, ' - ';
+        if ($pdb->{version} == 4 || $pdb->{options}->{v4compatible}) {
+            print ' - ', $acct->{account};
+        } else {
+            foreach my $a (@{ $acct }) {
+                if ($a->{type} eq 'account') {
+                    print ' - ',  $a->{data};
+                    last;
+                }
+            }
+        }
+        print "\n";
     }
 
 =head1 SUBROUTINES/METHODS
@@ -1312,7 +1338,7 @@
     $pdb = new Palm::Keyring({ key1 => value1,  key2 => value2 });
     $pdb = new Palm::Keyring( -key1 => value1, -key2 => value2);
 
-=head3 Supported options are:
+Supported options
 
 =over
 
@@ -1342,15 +1368,19 @@
 
 The number of iterations to encrypt with.
 
+=item options
+
+A hashref of the options that are set
+
 =back
 
 For v5 databases there are some additional appinfo fields set.
 
-	$pdb->{appinfo} = {
-		# normal appinfo stuff described in L<Palm::StdAppInfo>
-		cipher     => The index number of the cipher being used
-		iter       => Number of iterations for the cipher
-	};
+    $pdb->{appinfo} = {
+        # normal appinfo stuff described in L<Palm::StdAppInfo>
+        cipher     => The index number of the cipher being used
+        iter       => Number of iterations for the cipher
+    };
 
 =head2 crypt
 
@@ -1425,7 +1455,7 @@
 
 
 The account name is stored in $rec->{name} for both v4 and v5 databases.  
-It is not returned in the decrypted information for v5.
+It is not returned in the decrypted information for v5.  
 
     $rec->{name} = 'account name';
 
@@ -1469,23 +1499,23 @@
 
 For v4
 
-	$pdb->{digest}   = the calculated digest used from the key;
-	$pdb->{password} = the password that was passed in;
+    $pdb->{digest}   = the calculated digest used from the key;
+    $pdb->{password} = the password that was passed in;
 
 For v5
 
-	$pdb->{appinfo} = {
-		# As described under new() with these additional fields
-		cipher     => The index number of the cipher being used
-		iter       => Number of iterations for the cipher
-		key        => The key that is calculated from the password 
-		              and salt and is used to decrypt the records.
-		masterhash => the hash of the key that is stored in the 
-		              database.  Either set when Loading the database
-					  or when setting a new password.
-		salt       => the salt that is either read out of the database 
-		              or calculated when setting a new password.
-	};
+    $pdb->{appinfo} = {
+        # As described under new() with these additional fields
+        cipher     => The index number of the cipher being used
+        iter       => Number of iterations for the cipher
+        key        => The key that is calculated from the password 
+                      and salt and is used to decrypt the records.
+        masterhash => the hash of the key that is stored in the 
+                      database.  Either set when Loading the database
+                      or when setting a new password.
+        salt       => the salt that is either read out of the database 
+                      or calculated when setting a new password.
+    };
 
 =head1 DEPENDENCIES