Skip to content

Ct/escape eq #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 6, 2015
Merged

Ct/escape eq #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f653a9f
adding escape_eq
einhverfr Jul 6, 2015
2370819
version number changes and changelog entry
einhverfr Jul 6, 2015
efae588
One more corner case handled, needs some time and review.
einhverfr Jul 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
Revision history for Crypt-NamedKeys

1.0.0 2015-07-07
Allow = to be replaced by - for web apps.

0.02 2014-11-03
Fixed missing dependency on some platforms
Added repo to Meta
Expand Down
20 changes: 19 additions & 1 deletion lib/Crypt/NamedKeys.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ In general we assume key spefications to use numeric keys within the named
key hash. This makes key rotation a lot easier and prevents reusing key
numbers.

Key names may not contain = or -.

All keys listed can be used for decryption (with the special 'none' key used if
no key number is specified in the cyphertex), but by default only the default
keynumber (default_keynum, in this case 9) is used for encrypting.
Expand Down Expand Up @@ -156,7 +158,19 @@ use Try::Tiny;
use YAML::XS;


our $VERSION = '0.0.2';
our $VERSION = '1.0.0';

=head1 CONFIGURATION PARAMETERS

=head2 $Crypt::NamedKeys::Escape_Eq;

Set to true, using local or not, if you want to encode with - instead of =

Note that on decryption both are handled.

=cut

our $Escape_Eq = 0;

=head1 PROPERTIES

Expand Down Expand Up @@ -295,6 +309,8 @@ sub encrypt_data {
keyname => $self->keyname,
keynum => $self->keynum
));
$data =~ s/=/-/g if $Escape_Eq;
$mac =~ s/=/-/g if $Escape_Eq;
return {
data => $self->keynum . '*' . $data,
mac => $mac,
Expand All @@ -314,6 +330,8 @@ sub decrypt_data {
croak "method requires data and mac arguments" unless $args{data} and $args{mac};
# if the data was tampered do not try to decrypt it

$args{data} =~ s/-/=/g;
$args{mac} =~ s/-/=/g;
my ($keynum, $cyphertext) = split /\*/, $args{data}, 2;

if (!$cyphertext) {
Expand Down