*** Pipe.pm	Thu Aug 12 14:29:01 1999
--- Pipe.pm.new	Thu Aug 12 14:29:50 1999
***************
*** 315,329 ****
    $options = '-f -e';
    $options .= 'a' if ($args{'Armor'} == 1);
    $options .= 's' if (exists $args{'Sign'});
!   $options .= 'w' if ($args{'Wipe'} == 1);
!   $options .= 'm' if ($args{'Nosave'} == 1);
  
    # process the Key variable
    if (ref $args{'Key'} eq 'ARRAY')
    {
!     foreach $key (@keys)
      {		     
!       $options .= " 0x$key->{'Keyid'}";
      };
    } 
    else
--- 315,329 ----
    $options = '-f -e';
    $options .= 'a' if ($args{'Armor'} == 1);
    $options .= 's' if (exists $args{'Sign'});
!   $options .= 'w' if ($args{Wipe} && $args{'Wipe'} == 1);
!   $options .= 'm' if ($args{Nosave} && $args{'Nosave'} == 1);
  
    # process the Key variable
    if (ref $args{'Key'} eq 'ARRAY')
    {
!     foreach $key (@{$args{'Key'}})
      {		     
!       $options .= " 0x" . $key->{'Keyid'};
      };
    } 
    else
***************
*** 647,653 ****
    open (KEYB, ">/dev/tty");
    				       
    # now we get to act as a user to get the key signed!
!   while ($output = <FOUT>)
    { 	       
      PGP::Pipe::Debug ("FOUT: $output");
      last if ($output =~ /user ID/ );
--- 647,653 ----
    open (KEYB, ">/dev/tty");
    				       
    # now we get to act as a user to get the key signed!
!   while (defined($output = <FOUT>))
    { 	       
      PGP::Pipe::Debug ("FOUT: $output");
      last if ($output =~ /user ID/ );
***************
*** 656,662 ****
    print KEYB "y\n";     # say yes it is the key we want
    print "Sent a 'y' keystroke...";
      
!   while ($output = <FOUT>)
    {			 
      PGP::Pipe::Debug ("FOUT: $output");
      last if ($output =~ /Enter pass phrase:/);
--- 656,662 ----
    print KEYB "y\n";     # say yes it is the key we want
    print "Sent a 'y' keystroke...";
      
!   while (defined($output = <FOUT>))
    {			 
      PGP::Pipe::Debug ("FOUT: $output");
      last if ($output =~ /Enter pass phrase:/);
***************
*** 751,757 ****
        { $self->{Keys}->[$#{$self->{Keys}}]->Add_Sig ($_) };
      # more IDs to current key?
      /^\s{30,32}(.+)$/ && do 
!       { $self->{Keys}->[$#{$self->{Keys}}]->AddID ($1) };
        
      # public key trust entries follow
      last if (/^\s+KeyID\s+Trust\s+Validity\s+User ID/);  
--- 751,757 ----
        { $self->{Keys}->[$#{$self->{Keys}}]->Add_Sig ($_) };
      # more IDs to current key?
      /^\s{30,32}(.+)$/ && do 
!       { $self->{Keys}->[$#{$self->{Keys}}]->Add_ID ($1) };
        
      # public key trust entries follow
      last if (/^\s+KeyID\s+Trust\s+Validity\s+User ID/);  
***************
*** 833,839 ****
         else 
          {
  	  for ($[ .. $#{$key->{$crit}})
! 	  { next NONMATCH if ($key->{$crit}->[$_] !~ /$criteria{$crit}/i) };
  	};
      };
      push (@match, $key);
--- 833,840 ----
         else 
          {
  	  for ($[ .. $#{$key->{$crit}})
! 	  { next NONMATCH if (!$crit || !$key->{$crit}->[$_] || 
! 			      $key->{$crit}->[$_] !~ /$criteria{$crit}/i) };
  	};
      };
      push (@match, $key);
***************
*** 851,857 ****
  @ISA = qw(PGP::Pipe);
  
  use Time::Local;			
! use Dumper;
  
  =head2 PGP::Key
  
--- 852,858 ----
  @ISA = qw(PGP::Pipe);
  
  use Time::Local;			
! use Data::Dumper;
  
  =head2 PGP::Key