===================================================================
RCS file: /cvs/palm/Palm-Keyring/lib/Palm/Keyring.pm,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- palm/Palm-Keyring/lib/Palm/Keyring.pm	2008/09/19 07:01:00	1.62
+++ palm/Palm-Keyring/lib/Palm/Keyring.pm	2011/09/18 00:45:33	1.63
@@ -899,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;
@@ -1088,6 +1086,9 @@
 
 sub _calc_keys 
 {
+    require Digest::MD5;
+    import Digest::MD5 qw(md5);
+
     my $pass = shift;
     if (! defined $pass) { croak('No password defined!'); };