projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rt 4.2.16
[freeside.git]
/
rt
/
lib
/
RT
/
Crypt
/
GnuPG.pm
diff --git
a/rt/lib/RT/Crypt/GnuPG.pm
b/rt/lib/RT/Crypt/GnuPG.pm
index
ddb91e4
..
8b15ee2
100644
(file)
--- a/
rt/lib/RT/Crypt/GnuPG.pm
+++ b/
rt/lib/RT/Crypt/GnuPG.pm
@@
-2,7
+2,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
5
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
9
Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-911,10
+911,10
@@
sub _CheckIfProtectedInline {
}
while ( defined($_ = $io->getline) ) {
}
while ( defined($_ = $io->getline) ) {
- if ( /^-----BEGIN PGP (SIGNED )?MESSAGE-----/ ) {
+ if ( /^-----BEGIN PGP (SIGNED )?MESSAGE-----
\s*$
/ ) {
return $1? 'signed': 'encrypted';
}
return $1? 'signed': 'encrypted';
}
- elsif ( $check_for_signature && !/^-----BEGIN PGP SIGNATURE-----/ ) {
+ elsif ( $check_for_signature && !/^-----BEGIN PGP SIGNATURE-----
\s*$
/ ) {
return 'signature';
}
}
return 'signature';
}
}
@@
-1092,7
+1092,7
@@
sub DecryptInline {
binmode $block_fh, ':raw';
while ( defined(my $str = $io->getline) ) {
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;
print $block_fh $str;
$in_block--;
next if $in_block > 0;
@@
-1116,7
+1116,7
@@
sub DecryptInline {
binmode $block_fh, ':raw';
$in_block = 0;
}
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;
}
$in_block++;
print $block_fh $str;
}