Changeset 321

Show
Ignore:
Timestamp:
09/01/08 00:24:35 (3 months ago)
Author:
mbr
Message:

merged in 'signed' vs. 'verified' text fix

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gpgdir/trunk/gpgdir

    r314 r321  
    387387} 
    388388 
    389 if ($encrypt_mode) { 
     389if ($signing_mode) { 
     390    print "[+] Total number of files signed: " . 
     391        "$total_encrypted\n" unless $quiet; 
     392} elsif ($encrypt_mode) { 
    390393    print "[+] Total number of files encrypted: " . 
    391394        "$total_encrypted\n" unless $quiet; 
     395} elsif ($verify_mode) { 
     396    print "[+] Total number of files verified: " . 
     397        "$total_decrypted\n" unless $quiet; 
    392398} else { 
    393399    print "[+] Total number of files decrypted: " . 
    …… 
    488494    } 
    489495 
    490     return; 
     496    return 1; 
    491497} 
    492498 
    …… 
    635641        } 
    636642    } 
    637     return; 
     643    if ($bad_signature) { 
     644        return 0; 
     645    } 
     646    return 1; 
    638647} 
    639648 
    …… 
    757766            unless ($trial_run) { 
    758767 
    759                 &encrypt_or_sign_file($filename, $encrypt_filename, 
     768                my $rv = &encrypt_or_sign_file($filename, $encrypt_filename, 
    760769                        $NO_DEL_SOURCE_FILE); 
    761770 
    …… 
    865874                $str = 'Verifying' if $verify_mode; 
    866875                print "[+] $str:  $dir/$filename\n" unless $quiet; 
    867                 &decrypt_or_verify_file($filename, $decrypt_filename, 
     876                my $rv = &decrypt_or_verify_file($filename, $decrypt_filename, 
    868877                        $NO_DEL_SOURCE_FILE); 
    869878 
    870                 unless ($verify_mode) { 
     879                if ($verify_mode) { 
     880                    $total_decrypted++ if $rv; 
     881                } else { 
    871882                    if (-e $decrypt_filename and -s $decrypt_filename != 0) { 
    872883                        ### set the atime and mtime to be the same as the