===================================================================
RCS file: /cvs/palm/Palm-Keyring/t/keyring5.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- palm/Palm-Keyring/t/keyring5.t	2007/02/19 02:55:35	1.3
+++ palm/Palm-Keyring/t/keyring5.t	2007/02/22 04:57:37	1.4
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $RedRiver: keyring5.t,v 1.2 2007/02/19 01:37:10 andrew Exp $
+# $RedRiver: keyring5.t,v 1.3 2007/02/19 02:55:35 andrew Exp $
 use strict;
 use warnings;
 
@@ -21,6 +21,8 @@
     my $record;
     my $decrypted;
 
+    my $crypt = Palm::Keyring::crypts($cipher);
+
     my $options = {
         version  => 5,
         password => $password,
@@ -92,87 +94,98 @@
     ]
     ];
 
-    ok( $pdb = new Palm::Keyring($options), 'New Palm::Keyring v' 
-        . $options->{version} 
-        . ' Cipher ' 
-        . $options->{cipher}
-    );
+    SKIP: {
+        if ($cipher > 0) {
+            skip 'Crypt::CBC not installed', 31 unless 
+                eval "require Crypt::CBC";
+            skip 'Crypt::' . $crypt->{name} . ' not installed', 31 unless 
+                eval "require Crypt::$crypt->{name}";
+        }
+        skip 'Digest::HMAC_SHA1 not installed', 31 unless 
+            eval " require Digest::HMAC_SHA1 ";
 
-    my $rec_id = 0;
-    foreach my $acct (@{ $original_accts} ) {
-        ok( $record = $pdb->append_Record(), 'Append Record' );
-        if ($rec_id == 1) {
-            ok( $record->{name} = $rec1_name, 'Setting record name' );
+        ok( $pdb = new Palm::Keyring($options), 'New Palm::Keyring v' 
+            . $options->{version} 
+            . ' Cipher ' 
+            . $options->{cipher}
+        );
+
+        my $rec_id = 0;
+        foreach my $acct (@{ $original_accts} ) {
+            ok( $record = $pdb->append_Record(), 'Append Record' );
+            if ($rec_id == 1) {
+                ok( $record->{name} = $rec1_name, 'Setting record name' );
+            }
+            ok( $pdb->Encrypt($record, $acct, $password), 'Encrypt account into record' );
+            $rec_id++;
         }
-        ok( $pdb->Encrypt($record, $acct, $password), 'Encrypt account into record' );
-        $rec_id++;
-    }
 
-    ok( $pdb->Write($file), 'Write file' );
+        ok( $pdb->Write($file), 'Write file' );
 
-    $pdb = undef;
+        $pdb = undef;
 
-    ok( $pdb = new Palm::PDB(), 'New Palm::PDB' );
+        ok( $pdb = new Palm::PDB(), 'New Palm::PDB' );
 
-    ok( $pdb->Load($file), 'Load File' );
+        ok( $pdb->Load($file), 'Load File' );
 
-    ok( $pdb->Password($password), 'Verify Password' );
+        ok( $pdb->Password($password), 'Verify Password' );
 
-    $rec_id = 0;
-    foreach my $rec (@{ $pdb->{records} }) {
+        $rec_id = 0;
+        foreach my $rec (@{ $pdb->{records} }) {
         ok( $decrypted = $pdb->Decrypt($rec), 'Decrypt record' );
         if ($rec_id == 1) {
-            is( $rec->{name}, $rec1_name, 'Checking record name' );
+        is( $rec->{name}, $rec1_name, 'Checking record name' );
         }
         push @recs, $decrypted;
         $rec_id++;
-    }
+        }
 
-    is_deeply( \@recs, $original_accts, 'Account Matches' );
+        is_deeply( \@recs, $original_accts, 'Account Matches' );
 
-    @recs = ();
-    my $rec_num = 1;
+        @recs = ();
+        my $rec_num = 1;
 
-    ok( $pdb->Password($password, $new_password), 'Change PDB Password' );
+        ok( $pdb->Password($password, $new_password), 'Change PDB Password' );
 
-    foreach my $rec (@{ $pdb->{records} }) {
+        foreach my $rec (@{ $pdb->{records} }) {
         ok( $decrypted = $pdb->Decrypt($rec), 'Decrypt record' );
         push @recs, $decrypted;
-    }
+        }
 
-    is_deeply( \@recs, $original_accts, 'Account Matches' );
+        is_deeply( \@recs, $original_accts, 'Account Matches' );
 
-    my $acct;
-    ok( $acct = $pdb->Decrypt( $pdb->{records}->[$rec_num]), 'decrypt record ' . $rec_num);
+        my $acct;
+        ok( $acct = $pdb->Decrypt( $pdb->{records}->[$rec_num]), 'decrypt record ' . $rec_num);
 
-    foreach my $field (@{ $acct }) {
+        foreach my $field (@{ $acct }) {
         next unless $field->{label} eq 'password';
         ok($field->{data} = $new_password, 'Change password');
-    }
+        }
 
-    ok(  $pdb->Encrypt($pdb->{'records'}->[$rec_num], $acct), 'Change record' );
+        ok(  $pdb->Encrypt($pdb->{'records'}->[$rec_num], $acct), 'Change record' );
 
-    ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 'Decrypt changed record' );
+        ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 'Decrypt changed record' );
 
-    is_deeply($acct, $decrypted, 'Compare changed record');
+        is_deeply($acct, $decrypted, 'Compare changed record');
 
-    $decrypted = [];
-    ok( $pdb->Password(), 'Forget password' );
+        $decrypted = [];
+        ok( $pdb->Password(), 'Forget password' );
 
-    eval{ $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]) };
-    ok($@, 'Don\'t decrypt');
+        eval{ $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]) };
+        ok($@, 'Don\'t decrypt');
 
-    my $got_password = 'Got nothing';
-    if ($decrypted) {
+        my $got_password = 'Got nothing';
+        if ($decrypted) {
         foreach my $field (@{ $decrypted }) {
-            next unless $field->{label} eq 'password';
-            $got_password = $field->{data};
+        next unless $field->{label} eq 'password';
+        $got_password = $field->{data};
         }
-    }
+        }
 
-    isnt( $got_password, $new_password, 'Didn\'t get new password' );
+        isnt( $got_password, $new_password, 'Didn\'t get new password' );
 
-    ok( unlink($file), 'Remove test pdb v' . $options->{version} );
+        ok( unlink($file), 'Remove test pdb v' . $options->{version} );
+        }
 }
 
 1;