r45617 - in /trunk/libdbix-class-encodedcolumn-perl: Changes META.yml Makefile.PL debian/changelog debian/copyright lib/DBIx/Class/EncodedColumn.pm lib/DBIx/Class/EncodedColumn/Digest.pm t/02digest.t t/lib/DigestTest/Schema/Test.pm
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Mon Oct 12 04:55:26 UTC 2009
Author: jawnsy-guest
Date: Mon Oct 12 04:55:19 2009
New Revision: 45617
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=45617
Log:
+ Fixes hashing and validation with Whirlpool
* Add Kent Fredric to copyright (since he's now in CONTRIBUTORS)
Modified:
trunk/libdbix-class-encodedcolumn-perl/Changes
trunk/libdbix-class-encodedcolumn-perl/META.yml
trunk/libdbix-class-encodedcolumn-perl/Makefile.PL
trunk/libdbix-class-encodedcolumn-perl/debian/changelog
trunk/libdbix-class-encodedcolumn-perl/debian/copyright
trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn.pm
trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn/Digest.pm
trunk/libdbix-class-encodedcolumn-perl/t/02digest.t
trunk/libdbix-class-encodedcolumn-perl/t/lib/DigestTest/Schema/Test.pm
Modified: trunk/libdbix-class-encodedcolumn-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/Changes?rev=45617&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/Changes (original)
+++ trunk/libdbix-class-encodedcolumn-perl/Changes Mon Oct 12 04:55:19 2009
@@ -1,3 +1,7 @@
+
+ - Fix hashing/validation with Whirlpool ( Kent Fredric )
+ - Add Repository META
+
0.00004 2009-09-03
- correct option name typo in the docs (digest_class -> encode_class)
- put the .gpg files back into the test so tests pass (mst == fool)
Modified: trunk/libdbix-class-encodedcolumn-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/META.yml?rev=45617&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/META.yml (original)
+++ trunk/libdbix-class-encodedcolumn-perl/META.yml Mon Oct 12 04:55:19 2009
@@ -27,4 +27,5 @@
Sub::Name: 0.04
resources:
license: http://dev.perl.org/licenses/
-version: 0.00004
+ repository: http://dev.catalyst.perl.org/repos/bast/trunk/DBIx-Class-EncodedColumn
+version: 0.00005
Modified: trunk/libdbix-class-encodedcolumn-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/Makefile.PL?rev=45617&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/Makefile.PL (original)
+++ trunk/libdbix-class-encodedcolumn-perl/Makefile.PL Mon Oct 12 04:55:19 2009
@@ -7,6 +7,8 @@
name 'DBIx-Class-EncodedColumn';
abstract "Automatically encode column values";
all_from 'lib/DBIx/Class/EncodedColumn.pm';
+
+repository 'http://dev.catalyst.perl.org/repos/bast/trunk/DBIx-Class-EncodedColumn';
# Specific dependencies
requires 'DBIx::Class' => '0.06002';
Modified: trunk/libdbix-class-encodedcolumn-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/debian/changelog?rev=45617&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/debian/changelog (original)
+++ trunk/libdbix-class-encodedcolumn-perl/debian/changelog Mon Oct 12 04:55:19 2009
@@ -1,11 +1,10 @@
-libdbix-class-encodedcolumn-perl (0.00004-1) UNRELEASED; urgency=low
-
- Only some documentation changes, I don't think it's worth upload
- IGNORE-VERSION: 0.00004-1
+libdbix-class-encodedcolumn-perl (0.00005-1) UNRELEASED; urgency=low
* New upstream release
+ + Fixes hashing and validation with Whirlpool
+ * Add Kent Fredric to copyright (since he's now in CONTRIBUTORS)
- -- Jonathan Yu <jawnsy at cpan.org> Fri, 18 Sep 2009 19:50:36 -0400
+ -- Jonathan Yu <jawnsy at cpan.org> Sun, 11 Oct 2009 21:08:52 -0400
libdbix-class-encodedcolumn-perl (0.00003-1) unstable; urgency=low
Modified: trunk/libdbix-class-encodedcolumn-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/debian/copyright?rev=45617&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/debian/copyright (original)
+++ trunk/libdbix-class-encodedcolumn-perl/debian/copyright Mon Oct 12 04:55:19 2009
@@ -7,6 +7,7 @@
Files: *
Copyright: 2008-2009, Guillermo Roditi <groditi at cpan.org>
2008-2009, Matt S Trout <mst at shadowcat.co.uk>
+ 2008-2009, Kent Fredric <kentnl at cpan.org>
License-Alias: Perl
License: Artistic | GPL-1+
Modified: trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn.pm?rev=45617&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn.pm (original)
+++ trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn.pm Mon Oct 12 04:55:19 2009
@@ -9,7 +9,7 @@
__PACKAGE__->mk_classdata( _column_encoders => {} );
-our $VERSION = '0.00004';
+our $VERSION = '0.00005';
sub register_column {
my $self = shift;
@@ -229,7 +229,11 @@
=head1 CONTRIBUTORS
+kentnl - Kent Fredric <kentnl at cpan.org>
+
mst - Matt S Trout <mst at shadowcat.co.uk>
+
+=back
=head1 COPYRIGHT
Modified: trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn/Digest.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn/Digest.pm?rev=45617&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn/Digest.pm (original)
+++ trunk/libdbix-class-encodedcolumn-perl/lib/DBIx/Class/EncodedColumn/Digest.pm Mon Oct 12 04:55:19 2009
@@ -46,7 +46,7 @@
my $encoder = sub {
my ($plain_text, $salt) = @_;
$salt ||= join('', map { $salt_pool[int(rand(65))] } 1 .. $slen);
- $object->add($plain_text.$salt);
+ $object->reset()->add($plain_text.$salt);
my $digest = $object->$format_method;
#print "${plain_text}\t ${salt}:\t${digest}${salt}\n" if $salt;
return $digest.$salt;
@@ -176,6 +176,10 @@
Based on the Vienna WoC ToDo manager code by Matt S trout (mst)
+=head1 CONTRIBUTORS
+
+See L<DBIx::Class::EncodedColumn>
+
=head1 LICENSE
This module is free software; you can redistribute it and/or modify it under
Modified: trunk/libdbix-class-encodedcolumn-perl/t/02digest.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/t/02digest.t?rev=45617&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/t/02digest.t (original)
+++ trunk/libdbix-class-encodedcolumn-perl/t/02digest.t Mon Oct 12 04:55:19 2009
@@ -9,17 +9,20 @@
use FindBin '$Bin';
use lib File::Spec->catdir($Bin, 'lib');
-my ($sha_ok, $bcrypt_ok, $pgp_ok);
+my ($sha_ok, $bcrypt_ok, $pgp_ok, $whirlpool_ok);
+
BEGIN {
$sha_ok = eval 'require Digest' && eval 'require Digest::SHA;';
$bcrypt_ok = eval 'require Crypt::Eksblowfish::Bcrypt';
$pgp_ok = eval 'require Crypt::OpenPGP';
+ $whirlpool_ok = eval 'require Digest; 1' && eval 'require Digest::Whirlpool; 1';
}
my $tests = 5;
$tests += 21 if $sha_ok;
$tests += 6 if $bcrypt_ok;
$tests += 6 if $pgp_ok;
+$tests += 7 if $whirlpool_ok;
plan tests => $tests;
@@ -45,11 +48,30 @@
}
}
}
+if ( $whirlpool_ok ) {
+ for my $algorithm( qw/Whirlpool/){
+ my $maker = Digest->new($algorithm);
+ my $encodings = $checks->{$algorithm} = {};
+ for my $encoding (qw/base64 hex/){
+ my $values = $encodings->{$encoding} = {};
+ my $encoding_method = $encoding eq 'binary' ? 'digest' :
+ ($encoding eq 'hex' ? 'hexdigest' : 'b64digest');
+ for my $value (qw/test1 test2/){
+ $maker->reset()->add($value);
+ $values->{$value} = $maker->$encoding_method;
+ }
+ }
+ }
+}
my %create_vals = (dummy_col => 'test1');
if( $sha_ok ){
$create_vals{$_} = 'test1'
for(qw/sha1_hex sha1_b64 sha256_hex sha256_b64 sha256_b64_salted/);
+}
+if( $whirlpool_ok ){
+ $create_vals{$_} = 'test1'
+ for(qw/whirlpool_hex whirlpool_b64/);
}
if( $bcrypt_ok ){
@@ -132,6 +154,23 @@
is($copy->sha256b64, $checks->{'SHA-256'}{base64}{test2},'b64 sha256 on copy');
}
+# 7
+if( $whirlpool_ok ){
+ is( $row->whirlpool_hex, $checks->{'Whirlpool'}{hex}{test1}, 'Whirlpool hex');
+ is( $row->whirlpool_b64, $checks->{'Whirlpool'}{base64}{test1}, 'Whirlpool b64');
+
+ can_ok( $row, qw/check_whirlpool_hex check_whirlpool_b64/ );
+ ok( $row->check_whirlpool_hex('test1'), 'Checking hex digest_check_method for Whirlpool');
+ ok( $row->check_whirlpool_b64('test1'), 'Checking b64 digest_check_method for Whirlpool');
+
+ $row->whirlpool_hex('test2');
+ is( $row->whirlpool_hex, $checks->{'Whirlpool'}{hex}{test2}, 'Checking accessor (Whirlpool)');
+
+ $row->update({ whirlpool_b64 => 'test2' });
+ is( $row->whirlpool_b64, $checks->{'Whirlpool'}{base64}{test2}, 'Checking Update (Whirlpool)');
+
+}
+
#1
my $new = $rs->new( \%create_vals );
is($new->dummy_col, 'test1', 'dummy on new');
Modified: trunk/libdbix-class-encodedcolumn-perl/t/lib/DigestTest/Schema/Test.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbix-class-encodedcolumn-perl/t/lib/DigestTest/Schema/Test.pm?rev=45617&op=diff
==============================================================================
--- trunk/libdbix-class-encodedcolumn-perl/t/lib/DigestTest/Schema/Test.pm (original)
+++ trunk/libdbix-class-encodedcolumn-perl/t/lib/DigestTest/Schema/Test.pm Mon Oct 12 04:55:19 2009
@@ -1,11 +1,12 @@
package # hide from PAUSE
DigestTest::Schema::Test;
-my ($sha_ok, $bcrypt_ok);
+my ($sha_ok, $bcrypt_ok, $whirlpool_ok);
BEGIN {
$sha_ok = eval 'require Digest' && eval 'require Digest::SHA;';
$bcrypt_ok = eval 'require Crypt::Eksblowfish::Bcrypt';
$pgp_ok = eval 'require Crypt::OpenPGP';
+ $whirlpool_ok = eval 'require Digest; 1' && eval 'require Digest::Whirlpool; 1';
}
use base qw/DBIx::Class/;
@@ -80,6 +81,35 @@
);
}
+if ( $whirlpool_ok ) {
+
+ __PACKAGE__->add_columns(
+ whirlpool_hex => {
+ data_type => 'char',
+ is_nullable => 1,
+ size => 128,
+ encode_column => 1,
+ encode_class => 'Digest',
+ encode_args => {
+ format => 'hex',
+ algorithm => 'Whirlpool',
+ },
+ encode_check_method => 'check_whirlpool_hex',
+ },
+ whirlpool_b64 => {
+ data_type => 'char',
+ is_nullable => 1,
+ size => 86,
+ encode_column => 1,
+ encode_class => 'Digest',
+ encode_args => {
+ algorithm => 'Whirlpool',
+ },
+ encode_check_method => 'check_whirlpool_b64',
+ },
+ );
+}
+
if( $bcrypt_ok ){
__PACKAGE__->add_columns(
bcrypt_1 => {
More information about the Pkg-perl-cvs-commits
mailing list