X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fp5-File-KDBX;a=blobdiff_plain;f=lib%2FFile%2FKDBX%2FLoader%2FV4.pm;h=87e88262588654b74fe0fad80946405306f74bb5;hp=2180d28df8d37c9b11ed301cc83becc47fe856ea;hb=37b09e0f2832514b33de4499a83f22d5ffe7c0a3;hpb=8a37f035ef35682b764c34e7b3c61ce03318b1c7 diff --git a/lib/File/KDBX/Loader/V4.pm b/lib/File/KDBX/Loader/V4.pm index 2180d28..87e8826 100644 --- a/lib/File/KDBX/Loader/V4.pm +++ b/lib/File/KDBX/Loader/V4.pm @@ -22,13 +22,13 @@ use Crypt::Mac::HMAC qw(hmac); use Encode qw(decode); use File::KDBX::Constants qw(:header :inner_header :variant_map :compression); use File::KDBX::Error; -use File::KDBX::Util qw(:io :load assert_64bit erase_scoped); +use File::KDBX::Util qw(:class :io :load assert_64bit erase_scoped); use File::KDBX::IO::Crypt; use File::KDBX::IO::HmacBlock; use boolean; use namespace::clean; -use parent 'File::KDBX::Loader'; +extends 'File::KDBX::Loader'; our $VERSION = '999.999'; # VERSION @@ -45,7 +45,7 @@ sub _read_header { $buf .= $val; } - $type = KDBX_HEADER($type); + $type = kdbx_header($type); if ($type == HEADER_END) { # done } @@ -236,7 +236,7 @@ sub _read_inner_header { read_all $fh, $val, $size or throw 'Expected inner header value', type => $type, size => $size; } - my $dualtype = KDBX_INNER_HEADER($type); + my $dualtype = kdbx_inner_header($type); if (!defined $dualtype) { alert "Ignoring unknown inner header type ($type)", type => $type, size => $size, value => $val;