Don't need Crypt::Random if Bytes::Random::Secure is available

Crypt::PWSafe3 already prefers Bytes::Random::Secure over Crypt::Random but
still has a hard dependency on it, via an unconditional "use Crypt::Random".
This is no longer necessary since Crypt::Random will be require-d if a
suitably recent version of Bytes::Random::Secure cannot be found.

The Makefile.PL is also updated to reflect this approach.
This commit is contained in:
Paul Howarth
2020-05-29 09:18:34 +01:00
parent b51bb9f89e
commit e702365826
2 changed files with 8 additions and 2 deletions

View File

@@ -28,7 +28,6 @@ my %params = (
'Crypt::CBC' => 2.30,
'Crypt::ECB' => 1.45,
'Crypt::Twofish' => 2.14,
'Crypt::Random' => 1.25,
'Data::UUID' => 1.217,
'Shell' => 0.5,
'File::Temp' => 0,
@@ -40,6 +39,14 @@ my %params = (
($ExtUtils::MakeMaker::VERSION >= 6.3002 ? ('LICENSE' => 'perl', ) : ()),
);
# Already tried requiring Bytes::Random::Secure earlier, so now check the version
# and if it's OK, add a dependency on it; otherwise, fall back to Crypt::Random
if (eval { Bytes::Random::Secure->VERSION('0.09') }) {
$params{'PREREQ_PM'}{'Bytes::Random::Secure'} = 0.09;
} else {
$params{'PREREQ_PM'}{'Crypt::Random'} = 1.25;
};
if ( $ExtUtils::MakeMaker::VERSION ge '6.46' ) {
$params{META_MERGE} = {
resources => {

View File

@@ -21,7 +21,6 @@ use Crypt::ECB;
use Crypt::Twofish;
use Digest::HMAC;
use Digest::SHA;
use Crypt::Random qw( makerandom );
use Data::UUID;
use File::Copy qw(copy move);
use File::Temp;