summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcranix <cranix@hackerspace.pl>2017-02-28 17:41:50 +0100
committercranix <cranix@hackerspace.pl>2017-02-28 17:41:50 +0100
commit9e01dec26989c63d1cb50e5620c7e6891a26087b (patch)
treeb96d2fe88fe2d8f29218049b5fe41d0461d3dd10
parent994dbdfaa49bbe173e47c5a839c8ecf6f2489746 (diff)
parentcc9a7a4ce2f7b238baa98e12e248a17b3f561a16 (diff)
downloadkuvert-9e01dec26989c63d1cb50e5620c7e6891a26087b.tar.gz
kuvert-9e01dec26989c63d1cb50e5620c7e6891a26087b.tar.bz2
kuvert-9e01dec26989c63d1cb50e5620c7e6891a26087b.zip
Merge branch 'master' of hackerspace.pl:cranix/kuvert
-rwxr-xr-xkuvert17
1 files changed, 9 insertions, 8 deletions
diff --git a/kuvert b/kuvert
index 2f6e660..4a8394f 100755
--- a/kuvert
+++ b/kuvert
@@ -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;
}
@@ -859,12 +860,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;
}
@@ -876,7 +877,7 @@ with the new config file in place.\n");
.($key?"key $key ":"")."for $who");
next;
}
-
+
if (/^\S/)
{
my ($key,$value)=split(/\s+/,$_,2);
@@ -936,7 +937,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")
@@ -1755,8 +1756,8 @@ otherwise everybody gets it signed (or even unsigned).
=item encrypt
-Encrypts and signs mail if key is found for given recipent.
-If no key is found mail is dropped
+The email is encrypted and signed if keys are available for all
+recipents, or dropped otherwise.
=back