1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
--- lib/OpenSSL.pm.orig
+++ lib/OpenSSL.pm
@@ -22,6 +22,7 @@
use POSIX;
use IPC::Open3;
+use IO::Select;
use Time::Local;
sub new {
@@ -41,7 +42,7 @@
close(TEST);
# set version (format: e.g. 0.9.7 or 0.9.7a)
- if($v =~ /\b(0\.9\.[678][a-z]?)\b/) {
+ if($v =~ /\b(0\.9\.[6-9][a-z]?)\b/ || $v =~ /\b(1\.0\.[01][a-z]?)\b/) {
$self->{'version'} = $1;
}
@@ -817,7 +818,7 @@
my $self = shift;
my $opts = { @_ };
- my ($tmp, $ext, $ret, $file, $pid, $cmd);
+ my ($tmp, $ext, $ret, $file, $pid, $cmd, $cmdout, $cmderr);
$file = HELPERS::mktmp($self->{'tmp'}."/data");
$cmd = "$self->{'bin'} $opts->{'cmd'}";
@@ -830,16 +831,7 @@
$cmd .= " -outform $opts->{'outform'}";
}
- my($rdfh, $wtfh);
- $ext = "$cmd\n\n";
- $pid = open3($wtfh, $rdfh, $rdfh, $cmd);
- print $wtfh "$opts->{'data'}\n";
- while(<$rdfh>){
- $ext .= $_;
- # print STDERR "DEBUG: cmd ret: $_";
- };
- waitpid($pid, 0);
- $ret = $?>>8;
+ ($ret, $tmp, $ext) = _run_with_fixed_input($cmd, $opts->{'data'});
if($self->{'broken'}) {
if(($ret != 0 && $opts->{'cmd'} ne 'crl') ||
@@ -859,14 +851,15 @@
}
}
- open(IN, $file) || do {
- my $t = sprintf(_("Can't open file %s: %s"), $file, $!);
- GUI::HELPERS::print_warning($t);
- return;
- };
- $tmp .= $_ while(<IN>);
- close(IN);
-
+ if (-s $file) { # If the file is empty, the payload is in $tmp (via STDOUT of the called process).
+ open(IN, $file) || do {
+ my $t = sprintf(_("Can't open file %s: %s"), $file, $!);
+ GUI::HELPERS::print_warning($t);
+ return;
+ };
+ $tmp .= $_ while(<IN>);
+ close(IN);
+ }
unlink($file);
return($ret, $tmp, $ext);
@@ -1076,4 +1069,72 @@
}
}
+
+=over
+
+=item _run_with_fixed_input($cmd, $input)
+
+This function runs C<$cmd> and writes the C<$input> to STDIN of the
+new process (all at once).
+
+While the command runs, all of its output to STDOUT and STDERR is
+collected.
+
+After the command terminates (closes both STDOUT and STDIN) the
+function returns the command's return value as well as everything it
+wrote to its STDOUT and STDERR in a list.
+
+=back
+
+=cut
+
+sub _run_with_fixed_input {
+ my $cmd = shift;
+ my $input = shift;
+
+ my ($wtfh, $rdfh, $erfh, $pid, $sel, $ret, $stdout, $stderr);
+ $erfh = Symbol::gensym; # Must not be false, otherwise it is lumped together with rdfh
+
+ # Run the command
+ $pid = open3($wtfh, $rdfh, $erfh, $cmd);
+ print $wtfh $input, "\n";
+
+ $stdout = '';
+ $stderr = '';
+ $sel = new IO::Select($rdfh, $erfh);
+ while (my @fhs = $sel->can_read()) {
+ foreach my $fh (@fhs) {
+ if ($fh == $rdfh) { # STDOUT
+ my $bytes_read = sysread($fh, my $buf='', 1024);
+ if ($bytes_read == -1) {
+ warn("Error reading from child's STDOUT: $!\n");
+ $sel->remove($fh);
+ } elsif ($bytes_read == 0) {
+ # print("Child's STDOUT closed.\n");
+ $sel->remove($fh);
+ } else {
+ $stdout .= $buf;
+ }
+ }
+ elsif ($fh == $erfh) { # STDERR
+ my $bytes_read = sysread($fh, my $buf='', 1024);
+ if ($bytes_read == -1) {
+ warn("Error reading from child's STDERR: $!\n");
+ $sel->remove($fh);
+ } elsif ($bytes_read == 0) {
+ # print("Child's STDERR closed.\n");
+ $sel->remove($fh);
+ } else {
+ $stderr .= $buf;
+ }
+ }
+ }
+ }
+
+ waitpid($pid, 0);
+ $ret = $?>>8;
+
+ return ($ret, $stdout, $stderr)
+ }
+
|
