diff options
| -rw-r--r-- | Changelog | 3 | ||||
| -rwxr-xr-x | client | 4 | ||||
| -rwxr-xr-x | lacme-accountd | 2 | ||||
| -rwxr-xr-x | webserver | 2 |
4 files changed, 7 insertions, 4 deletions
@@ -30,6 +30,9 @@ lacme (0.3) upstream; --version. - client: remove potential race when creating ACME challenge response files. + - When using open with mode "<&=" or ">&=", ensure the expression + (fileno) is interpreted as an integer. (This failed in Perl v5.14.2 + from Debian Jessie.) -- Guilhem Moulin <guilhem@guilhem.org> Sun, 19 Feb 2017 13:08:41 +0100 @@ -62,9 +62,9 @@ my $COMMAND = shift @ARGV // die; # Untaint and fdopen(3) the configuration file and listening socket (shift @ARGV // die) =~ /\A(\d+)\z/ or die; -open my $CONFFILE, '<&=', $1 or die "fdopen $1: $!"; +open (my $CONFFILE, '<&=', $1+0) or die "fdopen $1: $!"; (shift @ARGV // die) =~ /\A(\d+)\z/ or die; -open my $S, '+<&=', $1 or die "fdopen $1: $!"; +open (my $S, '+<&=', $1+0) or die "fdopen $1: $!"; ############################################################################# diff --git a/lacme-accountd b/lacme-accountd index 547af59..f0d7d51 100755 --- a/lacme-accountd +++ b/lacme-accountd @@ -140,7 +140,7 @@ $JWK = JSON::->new->encode($JWK); if (defined $OPTS{'conn-fd'}) { die "Invalid file descriptor" unless $OPTS{'conn-fd'} =~ /\A(\d+)\z/; # untaint and fdopen(3) our end of the socket pair - open $S, '+<&=', $1 or die "fdopen $1: $!"; + open ($S, '+<&=', $1+0) or die "fdopen $1: $!"; } else { my $sockname = $OPTS{socket} // (defined $ENV{XDG_RUNTIME_DIR} ? "$ENV{XDG_RUNTIME_DIR}/S.lacme" : undef); die "Missing socket option\n" unless defined $sockname; @@ -43,7 +43,7 @@ use Socket qw/AF_UNIX AF_INET AF_INET6/; # Untaint and fdopen(3) the listening socket (shift @ARGV // die) =~ /\A(\d+)\z/ or die; -open my $S, '+<&=', $1 or die "fdopen $1: $!"; +open (my $S, '+<&=', $1+0) or die "fdopen $1: $!"; my $ROOT = '/.well-known/acme-challenge'; close STDIN or die "close: $!"; |