Skip to content

Monkey patch two dependencies to use /dev/unrandom over /dev/random #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Monkey patch two dependencies to use /dev/unrandom over /dev/random #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions lib/Crypt/OpenPGP.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,53 @@ use File::Spec;

use vars qw( %COMPAT );

# HACK FOR PERFORMANCE
# Crypt::DSA::Util prefers /dev/random which can be slow sometimes. Let's try
# /dev/urandom if it's available to speed things up.
# Lame but it works...
{
use Carp;
use Fcntl;
use Crypt::DSA::Util;
no warnings 'redefine';

sub Crypt::DSA::Util::makerandom {
warn "Using hacked version of Crypt::DSA::Util::makerandom\n";
my %param = @_;
my $size = $param{Size};
my $bytes = int($size / 8) + 1;
my $r = '';

my $dev_rand = '/dev/random';
if (-r '/dev/urandom') {
$dev_rand = '/dev/urandom';
}

if ( sysopen my $fh, $dev_rand, O_RDONLY ) {
my $read = 0;
while ($read < $bytes) {
my $got = sysread $fh, my($chunk), $bytes - $read;
next unless $got;
die "Error: $!" if $got == -1;
$r .= $chunk;
$read = length $r;
}
close $fh;
}
elsif ( require Data::Random ) {
$r .= Data::Random::rand_chars( set=>'numeric' ) for 1..$bytes;
}
else {
croak "makerandom requires $dev_rand or Data::Random";
}
my $down = $size - 1;
$r = unpack 'H*', pack 'B*', '0' x ( $size % 8 ? 8 - $size % 8 : 0 ) .
'1' . unpack "b$down", $r;
Math::BigInt->new('0x' . $r);
}
}
# /HACK

## pgp2 and pgp5 do not trim trailing whitespace from "canonical text"
## signatures, only from cleartext signatures.
## See:
Expand Down
23 changes: 23 additions & 0 deletions lib/Crypt/OpenPGP/Util.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,29 @@ sub _ensure_bigint {
sub get_random_bytes {
my $length = shift;
if (eval 'require Crypt::Random; 1;') {
# HACK FOR PERFORMANCE
# In Crypt::Random::Seed::new dev_random is tried before dev_urandom,
# so let's override that method to check urandom first and then fall
# back on dev_random.
# Lame but it works...
{
no warnings 'redefine';

use Crypt::Random::Seed;

sub Crypt::Random::Seed::_try_dev_random {
warn "Using hacked version of Crypt::Random::Seed::_try_dev_random\n";
if (-r "/dev/urandom") {
return ('/dev/urandom', sub { Crypt::Random::Seed::__read_file('/dev/urandom', @_); }, 0, 0);
}
elsif (-r "/dev/random") {
my $blocking = ($^O eq 'freebsd') ? 0 : 1;
return ('/dev/random', sub { Crypt::Random::Seed::__read_file('/dev/random', @_); }, $blocking, 1);
}
return;
}
}
# /HACK
return Crypt::Random::makerandom_octet( Length => $length);
}
elsif (eval 'require Bytes::Random::Secure; 1;') {
Expand Down