summaryrefslogtreecommitdiff
path: root/Echolot
diff options
context:
space:
mode:
Diffstat (limited to 'Echolot')
-rw-r--r--Echolot/Conf.pm3
-rw-r--r--Echolot/Config.pm8
-rw-r--r--Echolot/Pinger/CPunk.pm3
-rw-r--r--Echolot/Pinger/Mix.pm11
-rw-r--r--Echolot/Stats.pm3
5 files changed, 17 insertions, 11 deletions
diff --git a/Echolot/Conf.pm b/Echolot/Conf.pm
index 9242045..f5872da 100644
--- a/Echolot/Conf.pm
+++ b/Echolot/Conf.pm
@@ -1,7 +1,7 @@
package Echolot::Conf;
# (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Conf.pm,v 1.22 2002/07/22 01:28:21 weasel Exp $
+# $Id: Conf.pm,v 1.23 2002/07/22 02:18:30 weasel Exp $
#
=pod
@@ -307,6 +307,7 @@ sub parse_cpunk_key($$$) {
my ($reply, $time, $remailer) = @_;
my $GnuPG = new GnuPG::Interface;
+ $GnuPG->call( Echolot::Config::get()->{'gnupg'} ) if (Echolot::Config::get()->{'gnupg'});
$GnuPG->options->hash_init(
homedir => Echolot::Config::get()->{'gnupghome'} );
$GnuPG->options->meta_interactive( 0 );
diff --git a/Echolot/Config.pm b/Echolot/Config.pm
index 98474a3..4e826c9 100644
--- a/Echolot/Config.pm
+++ b/Echolot/Config.pm
@@ -1,7 +1,7 @@
package Echolot::Config;
# (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Config.pm,v 1.30 2002/07/17 18:53:15 weasel Exp $
+# $Id: Config.pm,v 1.31 2002/07/22 02:18:30 weasel Exp $
#
=pod
@@ -106,7 +106,10 @@ sub init($) {
thesaurusdir => 'results/thesaurus',
thesaurusindexfile => 'results/thesaurus/index.html',
private_resultdir => 'results.private',
- gnupghome => 'gnupg',
+ gnupghome => 'gnupghome',
+ gnupg => '',
+ mixhome => 'mixhome',
+ mixmaster => 'mix',
tmpdir => 'tmp',
commands_file => 'commands.txt',
@@ -162,7 +165,6 @@ sub init($) {
my_domain => undef,
operator_address => undef,
sitename => undef,
- 'Pinger::Mix' => undef,
verbose => 0
};
diff --git a/Echolot/Pinger/CPunk.pm b/Echolot/Pinger/CPunk.pm
index 598e13e..3265d26 100644
--- a/Echolot/Pinger/CPunk.pm
+++ b/Echolot/Pinger/CPunk.pm
@@ -1,7 +1,7 @@
package Echolot::Pinger::CPunk;
# (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: CPunk.pm,v 1.5 2002/07/16 02:48:57 weasel Exp $
+# $Id: CPunk.pm,v 1.6 2002/07/22 02:18:30 weasel Exp $
#
=pod
@@ -35,6 +35,7 @@ sub encrypt_to($$$$) {
Echolot::Globals::get()->{'hostname'}.".".time.'.'.$PROCESS_ID.'_'.Echolot::Globals::get()->{'internalcounter'}++.'.keyring';
my $GnuPG = new GnuPG::Interface;
+ $GnuPG->call( Echolot::Config::get()->{'gnupg'} ) if (Echolot::Config::get()->{'gnupg'});
$GnuPG->options->hash_init(
homedir => Echolot::Config::get()->{'gnupghome'} );
$GnuPG->options->meta_interactive( 0 );
diff --git a/Echolot/Pinger/Mix.pm b/Echolot/Pinger/Mix.pm
index d68147c..f41f217 100644
--- a/Echolot/Pinger/Mix.pm
+++ b/Echolot/Pinger/Mix.pm
@@ -1,7 +1,7 @@
package Echolot::Pinger::Mix;
# (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Mix.pm,v 1.4 2002/07/16 02:48:57 weasel Exp $
+# $Id: Mix.pm,v 1.5 2002/07/22 02:18:30 weasel Exp $
#
=pod
@@ -25,7 +25,7 @@ sub ping($$$$) {
my $chaincomma = join (',', @$chain);
- my $keyring = Echolot::Config::get()->{'Pinger::Mix'}->{'mixdir'}.'/pubring.mix';
+ my $keyring = Echolot::Config::get()->{'mixhome'}.'/pubring.mix';
open (F, '>'.$keyring) or
cluck("Cannot open $keyring for writing: $!"),
return 0;
@@ -37,7 +37,7 @@ sub ping($$$$) {
cluck("Cannot close $keyring"),
return 0;
- my $type2list = Echolot::Config::get()->{'Pinger::Mix'}->{'mixdir'}.'/type2.list';
+ my $type2list = Echolot::Config::get()->{'mixhome'}.'/type2.list';
open (F, '>'.$type2list) or
cluck("Cannot open $type2list for writing: $!"),
return 0;
@@ -48,10 +48,11 @@ sub ping($$$$) {
cluck("Cannot close $type2list"),
return 0;
- open(MIX, "|".Echolot::Config::get()->{'Pinger::Mix'}->{'mix'}." -m -S -l $chaincomma") or
+ $ENV{'MIXPATH'} = Echolot::Config::get()->{'mixhome'};
+ open(MIX, "|".Echolot::Config::get()->{'mixmaster'}." -m -S -l $chaincomma") or
cluck("Cannot exec mixpinger: $!"),
return 0;
- print MIX "To: $to\n\n$body";
+ print MIX "To: $to\n\n$body\n";
close (MIX);
return 1;
diff --git a/Echolot/Stats.pm b/Echolot/Stats.pm
index 402cbd9..b948546 100644
--- a/Echolot/Stats.pm
+++ b/Echolot/Stats.pm
@@ -1,7 +1,7 @@
package Echolot::Stats;
# (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Stats.pm,v 1.22 2002/07/17 18:53:15 weasel Exp $
+# $Id: Stats.pm,v 1.23 2002/07/22 02:18:30 weasel Exp $
#
=pod
@@ -679,6 +679,7 @@ sub build_pgpring_export($$$$) {
sub build_pgpring() {
my $GnuPG = new GnuPG::Interface;
+ $GnuPG->call( Echolot::Config::get()->{'gnupg'} ) if (Echolot::Config::get()->{'gnupg'});
$GnuPG->options->hash_init(
armor => 1,
homedir => Echolot::Config::get()->{'gnupghome'} );