From fe0093f5f317cd136a2328abb7b0c31a69d4fe33 Mon Sep 17 00:00:00 2001
From: Charles McGarvey <ccm@cpan.org>
Date: Mon, 2 May 2022 22:18:35 -0600
Subject: [PATCH] Prereq CryptX 0.049 for encode_b32*

---
 lib/File/KDBX.pm             | 6 +++---
 lib/File/KDBX/Dumper/KDB.pm  | 2 --
 lib/File/KDBX/Dumper/V3.pm   | 1 -
 lib/File/KDBX/Entry.pm       | 2 +-
 lib/File/KDBX/Key/YubiKey.pm | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/File/KDBX.pm b/lib/File/KDBX.pm
index 4768eef..fee9dc5 100644
--- a/lib/File/KDBX.pm
+++ b/lib/File/KDBX.pm
@@ -1716,7 +1716,7 @@ A text string associated with the database. Often unset.
 
 The UUID of a cipher used to encrypt the database when stored as a file.
 
-See L</File::KDBX::Cipher>.
+See L<File::KDBX::Cipher>.
 
 =attr compression_flags
 
@@ -1821,7 +1821,7 @@ Number of days until the agent should prompt to recommend changing the master ke
 Number of days until the agent should prompt to force changing the master key.
 
 Note: This is purely advisory. It is up to the individual agent software to actually enforce it.
-C<File::KDBX> does NOT enforce it.
+B<File::KDBX> does NOT enforce it.
 
 =attr custom_icons
 
@@ -2380,7 +2380,7 @@ your own query logic, like this:
 
 Iterators are the built-in way to navigate or walk the database tree. You get an iterator from L</entries>,
 L</groups> and L</objects>. You can specify the search algorithm to iterate over objects in different orders
-using the C<algorith> option, which can be one of these L<constants|File::KDBX::Constants/":iteration">:
+using the C<algorithm> option, which can be one of these L<constants|File::KDBX::Constants/":iteration">:
 
 =for :list
 * C<ITERATION_IDS> - Iterative deepening search (default)
diff --git a/lib/File/KDBX/Dumper/KDB.pm b/lib/File/KDBX/Dumper/KDB.pm
index d2cb891..ff6df94 100644
--- a/lib/File/KDBX/Dumper/KDB.pm
+++ b/lib/File/KDBX/Dumper/KDB.pm
@@ -29,8 +29,6 @@ sub _write_body {
     my $k = File::KeePass::KDBX->new($self->kdbx)->to_fkp;
     $self->_write_custom_icons($self->kdbx, $k);
 
-    # TODO create a KPX_CUSTOM_ICONS_4 meta stream. FKP itself handles KPX_GROUP_TREE_STATE
-
     substr($k->header->{seed_rand}, 16) = '';
 
     $key = $self->kdbx->composite_key($key, keep_primitive => 1);
diff --git a/lib/File/KDBX/Dumper/V3.pm b/lib/File/KDBX/Dumper/V3.pm
index a0d5b4d..cf1f1ed 100644
--- a/lib/File/KDBX/Dumper/V3.pm
+++ b/lib/File/KDBX/Dumper/V3.pm
@@ -152,7 +152,6 @@ sub _write_body {
 
     $fh->print($kdbx->headers->{+HEADER_STREAM_START_BYTES})
         or throw 'Failed to write start bytes';
-    $fh->flush;
 
     $kdbx->key($key);
 
diff --git a/lib/File/KDBX/Entry.pm b/lib/File/KDBX/Entry.pm
index 3962c1d..8596aa2 100644
--- a/lib/File/KDBX/Entry.pm
+++ b/lib/File/KDBX/Entry.pm
@@ -4,7 +4,7 @@ package File::KDBX::Entry;
 use warnings;
 use strict;
 
-use Crypt::Misc 0.029 qw(decode_b64 encode_b32r);
+use Crypt::Misc 0.049 qw(decode_b64 encode_b32r);
 use Devel::GlobalDestruction;
 use Encode qw(encode);
 use File::KDBX::Constants qw(:history :icon);
diff --git a/lib/File/KDBX/Key/YubiKey.pm b/lib/File/KDBX/Key/YubiKey.pm
index 0e42eb0..0697b2b 100644
--- a/lib/File/KDBX/Key/YubiKey.pm
+++ b/lib/File/KDBX/Key/YubiKey.pm
@@ -456,7 +456,7 @@ C<run_forked> from L<IPC::Cmd> worked in Windows, but it probably doesn't. I spe
 various quirks to L<IPC::Open3> and L<IPC::Cmd> implementations but never quite got it to worked reliably
 without deadlocks. Maybe I'll revisit this later. Hit me up so I know if there's demand.
 
-It would also be possible to implement this is an XS module that incorporated ykcore, using libusb-1 which
+It would also be possible to implement this as an XS module that incorporated ykcore, using libusb-1 which
 would probably make it more portable with Windows. Perhaps if I get around to it.
 
 =cut
-- 
2.43.0