cranix
/
kuvert
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added handling of action 'encrypt' in read_config routine.

master
cranix 2017-02-27 22:48:56 +01:00
parent b9b56d7a66
commit cc9a7a4ce2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kuvert
View File

@ -395,6 +395,7 @@ sub crypt_send
# returns nothing if ok or @error msgs
sub process_file
{
dlogit("In processfile");
my ($fh,$file)=@_;
my $in_ent;
@ -431,7 +432,7 @@ sub process_file
# extract and delete blanket instruction header
my $override;
if (lc($in_ent->head->get("x-kuvert"))=~
/^\s*(none|fallback|fallback-all|signonly)\s*$/)
/^\s*(none|encrypt|fallback|fallback-all|signonly)\s*$/)
{
$override=$1;
}
@ -857,12 +858,12 @@ The result has been left in $nf and likely needs to be adjusted
for ${progname}'s new features. Please do so and restart $progname
with the new config file in place.\n");
}
if (/^\s+(\S+)\s+(fallback(-all)?(,(0x)?[a-fA-F0-9]+)?|signonly|none)\s*(\#.*)?$/)
if (/^\s+(\S+)\s+(fallback(-all)?(,(0x)?[a-fA-F0-9]+)?|signonly|none|encrypt)\s*(\#.*)?$/)
{
my ($who,$action)=($1,$2);
my $key;
if ($action=~s/^(fallback(-all)?),((0x)?[a-fA-F0-9]+)/$1/)
if ($action=~s/^(encrypt|fallback(-all)?),((0x)?[a-fA-F0-9]+)/$1/)
{
$key=$3;
}
@ -874,7 +875,7 @@ with the new config file in place.\n");
.($key?"key $key ":"")."for $who");
next;
}
if (/^\S/)
{
my ($key,$value)=split(/\s+/,$_,2);
@ -934,7 +935,7 @@ with the new config file in place.\n");
elsif ($key eq "defaultaction")
{
bailout("bad value \"$value\" for key \"$key\"")
if ($value!~/^(fallback|fallback-all|signonly|none)$/);
if ($value!~/^(fallback|fallback-all|signonly|none|encrypt)$/);
$options{$key}=$value;
}
elsif ($key eq "syslog")