===================================================================
RCS file: /cvs/palm/Palm-Keyring/lib/Palm/Keyring.pm,v
retrieving revision 1.61
retrieving revision 1.63
diff -u -r1.61 -r1.63
--- palm/Palm-Keyring/lib/Palm/Keyring.pm	2008/09/19 06:55:35	1.61
+++ palm/Palm-Keyring/lib/Palm/Keyring.pm	2011/09/18 00:45:33	1.63
@@ -1,5 +1,5 @@
 package Palm::Keyring;
-# $RedRiver: Keyring.pm,v 1.60 2008/09/19 05:53:08 andrew Exp $
+# $RedRiver: Keyring.pm,v 1.61 2008/09/19 05:55:35 andrew Exp $
 ########################################################################
 # Keyring.pm *** Perl class for Keyring for Palm OS databases.
 #
@@ -493,19 +493,13 @@
 
     $rec->{plaintext}->{0} = $data->{0};
 
-    if ($encrypted) { 
-        if ($encrypted eq '1') {
-            return 1;
-        }
-
+    if ($encrypted ne '1') {
         $rec->{attributes}{Dirty} = 1;
         $rec->{attributes}{dirty} = 1;
         $rec->{encrypted} = $encrypted;
-
-        return 1;
-    } else {
-        return;
     }
+
+    return 1;
 }
 
 sub _encrypt_v4 
@@ -905,11 +899,9 @@
     my $pass = shift;
     my $data = shift;
 
-    if (! $pass) { croak('No password specified!'); };
+    if (! $pass) { croak('No password specified!'); }
+    if (! $data) { croak("No encrypted password in file!"); }
 
-    # XXX die "No encrypted password in file!" unless defined $data;
-    if ( ! defined $data) { return; };
-
     $data =~ s/$NULL$//xm;
 
     my $salt = substr $data, 0, $kSalt_Size;
@@ -1094,6 +1086,9 @@
 
 sub _calc_keys 
 {
+    require Digest::MD5;
+    import Digest::MD5 qw(md5);
+
     my $pass = shift;
     if (! defined $pass) { croak('No password defined!'); };