diff options
Diffstat (limited to 'rt/lib/RT/Crypt')
| -rw-r--r-- | rt/lib/RT/Crypt/GnuPG.pm | 10 | ||||
| -rw-r--r-- | rt/lib/RT/Crypt/GnuPG/CRLFHandle.pm | 2 | ||||
| -rw-r--r-- | rt/lib/RT/Crypt/Role.pm | 2 | ||||
| -rw-r--r-- | rt/lib/RT/Crypt/SMIME.pm | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/rt/lib/RT/Crypt/GnuPG.pm b/rt/lib/RT/Crypt/GnuPG.pm index ddb91e4f5..e986447c8 100644 --- a/rt/lib/RT/Crypt/GnuPG.pm +++ b/rt/lib/RT/Crypt/GnuPG.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -911,10 +911,10 @@ sub _CheckIfProtectedInline { } while ( defined($_ = $io->getline) ) { - if ( /^-----BEGIN PGP (SIGNED )?MESSAGE-----/ ) { + if ( /^-----BEGIN PGP (SIGNED )?MESSAGE-----\s*$/ ) { return $1? 'signed': 'encrypted'; } - elsif ( $check_for_signature && !/^-----BEGIN PGP SIGNATURE-----/ ) { + elsif ( $check_for_signature && !/^-----BEGIN PGP SIGNATURE-----\s*$/ ) { return 'signature'; } } @@ -1092,7 +1092,7 @@ sub DecryptInline { binmode $block_fh, ':raw'; while ( defined(my $str = $io->getline) ) { - if ( $in_block && $str =~ /^-----END PGP (?:MESSAGE|SIGNATURE)-----/ ) { + if ( $in_block && $str =~ /^-----END PGP (?:MESSAGE|SIGNATURE)-----\s*$/ ) { print $block_fh $str; $in_block--; next if $in_block > 0; @@ -1116,7 +1116,7 @@ sub DecryptInline { binmode $block_fh, ':raw'; $in_block = 0; } - elsif ( $str =~ /^-----BEGIN PGP (SIGNED )?MESSAGE-----/ ) { + elsif ( $str =~ /^-----BEGIN PGP (SIGNED )?MESSAGE-----\s*$/ ) { $in_block++; print $block_fh $str; } diff --git a/rt/lib/RT/Crypt/GnuPG/CRLFHandle.pm b/rt/lib/RT/Crypt/GnuPG/CRLFHandle.pm index 74a400986..2dfc45224 100644 --- a/rt/lib/RT/Crypt/GnuPG/CRLFHandle.pm +++ b/rt/lib/RT/Crypt/GnuPG/CRLFHandle.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) diff --git a/rt/lib/RT/Crypt/Role.pm b/rt/lib/RT/Crypt/Role.pm index b1e368df7..6a33e5d77 100644 --- a/rt/lib/RT/Crypt/Role.pm +++ b/rt/lib/RT/Crypt/Role.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) diff --git a/rt/lib/RT/Crypt/SMIME.pm b/rt/lib/RT/Crypt/SMIME.pm index a676d8bff..743ab2bb8 100644 --- a/rt/lib/RT/Crypt/SMIME.pm +++ b/rt/lib/RT/Crypt/SMIME.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) |