summaryrefslogtreecommitdiff
path: root/Echolot
diff options
context:
space:
mode:
Diffstat (limited to 'Echolot')
-rw-r--r--Echolot/Conf.pm2
-rw-r--r--Echolot/Pinger/CPunk.pm4
-rw-r--r--Echolot/Stats.pm4
3 files changed, 5 insertions, 5 deletions
diff --git a/Echolot/Conf.pm b/Echolot/Conf.pm
index abe69c8..f6e2221 100644
--- a/Echolot/Conf.pm
+++ b/Echolot/Conf.pm
@@ -365,7 +365,7 @@ sub parse_cpunk_key($$$) {
commands => [qw{--with-colons}],
command_args => [qw{--no-options --no-secmem-warning --no-default-keyring --fast-list-mode}],
handles => $handles );
- my ($stdout, $stderr, $status) = readwrite_gpg($key, $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
+ my ($stdout, $stderr, $status) = Echolot::Tools::readwrite_gpg($key, $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
waitpid $pid, 0;
($stderr eq '') or
diff --git a/Echolot/Pinger/CPunk.pm b/Echolot/Pinger/CPunk.pm
index f07f1e3..9962675 100644
--- a/Echolot/Pinger/CPunk.pm
+++ b/Echolot/Pinger/CPunk.pm
@@ -44,7 +44,7 @@ sub encrypt_to($$$$) {
commands => [ '--import' ],
command_args => [qw{--no-options --no-secmem-warning --no-default-keyring --fast-list-mode --keyring}, $keyring, '--', '-' ],
handles => $handles );
- my ($stdout, $stderr, $status) = readwrite_gpg($keys->{$recipient}->{'key'}, $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
+ my ($stdout, $stderr, $status) = Echolot::Tools::readwrite_gpg($keys->{$recipient}->{'key'}, $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
waitpid $pid, 0;
($stdout eq '') or
@@ -96,7 +96,7 @@ sub encrypt_to($$$$) {
$pid = $GnuPG->encrypt(
command_args => $command_args,
handles => $handles );
- ($stdout, $stderr, $status) = readwrite_gpg('', $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
+ ($stdout, $stderr, $status) = Echolot::Tools::readwrite_gpg('', $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
waitpid $pid, 0;
#($stderr eq '') or
diff --git a/Echolot/Stats.pm b/Echolot/Stats.pm
index 0d97783..5fc0134 100644
--- a/Echolot/Stats.pm
+++ b/Echolot/Stats.pm
@@ -861,7 +861,7 @@ sub build_pgpring_type($$$$) {
commands => [ '--import' ],
command_args => [qw{--no-options --no-secmem-warning --no-default-keyring --fast-list-mode --keyring}, $keyring, '--', '-' ],
handles => $handles );
- my ($stdout, $stderr, $status) = readwrite_gpg($key{'key'}, $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
+ my ($stdout, $stderr, $status) = Echolot::Tools::readwrite_gpg($key{'key'}, $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
waitpid $pid, 0;
($stdout eq '') or
@@ -889,7 +889,7 @@ sub build_pgpring_export($$$$) {
commands => [ '--export' ],
command_args => [qw{--no-options --no-secmem-warning --no-default-keyring --keyring}, $keyring, @$keyids ],
handles => $handles );
- my ($stdout, $stderr, $status) = readwrite_gpg('', $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
+ my ($stdout, $stderr, $status) = Echolot::Tools::readwrite_gpg('', $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
waitpid $pid, 0;
open (F, ">$file") or