X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fp5-File-KDBX;a=blobdiff_plain;f=lib%2FFile%2FKDBX%2FKDF%2FAES.pm;h=5d6177b937f613cf99a2c9699884a692244750f5;hp=548f8620d5b1185e0a49ab59d4840ce24155d361;hb=37b09e0f2832514b33de4499a83f22d5ffe7c0a3;hpb=8a37f035ef35682b764c34e7b3c61ce03318b1c7 diff --git a/lib/File/KDBX/KDF/AES.pm b/lib/File/KDBX/KDF/AES.pm index 548f862..5d6177b 100644 --- a/lib/File/KDBX/KDF/AES.pm +++ b/lib/File/KDBX/KDF/AES.pm @@ -8,10 +8,10 @@ use Crypt::Cipher; use Crypt::Digest qw(digest_data); use File::KDBX::Constants qw(:bool :kdf); use File::KDBX::Error; -use File::KDBX::Util qw(:load can_fork); +use File::KDBX::Util qw(:class :load can_fork); use namespace::clean; -use parent 'File::KDBX::KDF'; +extends 'File::KDBX::KDF'; our $VERSION = '999.999'; # VERSION @@ -23,15 +23,6 @@ BEGIN { *_USE_FORK = $use_fork ? \&TRUE : \&FALSE; } -sub init { - my $self = shift; - my %args = @_; - return $self->SUPER::init( - KDF_PARAM_AES_ROUNDS() => $args{+KDF_PARAM_AES_ROUNDS} // $args{rounds}, - KDF_PARAM_AES_SEED() => $args{+KDF_PARAM_AES_SEED} // $args{seed}, - ); -} - =attr rounds $rounds = $kdf->rounds; @@ -43,6 +34,15 @@ Get the number of times to run the function during transformation. sub rounds { $_[0]->{+KDF_PARAM_AES_ROUNDS} || KDF_DEFAULT_AES_ROUNDS } sub seed { $_[0]->{+KDF_PARAM_AES_SEED} } +sub init { + my $self = shift; + my %args = @_; + return $self->SUPER::init( + KDF_PARAM_AES_ROUNDS() => $args{+KDF_PARAM_AES_ROUNDS} // $args{rounds}, + KDF_PARAM_AES_SEED() => $args{+KDF_PARAM_AES_SEED} // $args{seed}, + ); +} + sub _transform { my $self = shift; my $key = shift;