diff options
| author | Christian Pointner <equinox@anytun.org> | 2009-04-07 00:16:12 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2009-04-07 00:16:12 +0000 |
| commit | 613afe3c92c202da1900ef2f7000425f6baabb9e (patch) | |
| tree | 7e900a854b2377b78265a16fb7c1649067058ecc /src/anytun.cpp | |
| parent | some cleanup at new draft (diff) | |
removed anytun02-compat mode
Diffstat (limited to 'src/anytun.cpp')
| -rw-r--r-- | src/anytun.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/anytun.cpp b/src/anytun.cpp index 264e26f..34fd5f5 100644 --- a/src/anytun.cpp +++ b/src/anytun.cpp @@ -84,7 +84,7 @@ void createConnection(const PacketSourceEndpoint& remote_end, window_size_t seqS { SeqWindow* seq = new SeqWindow(seqSize); seq_nr_t seq_nr_=0; - KeyDerivation * kd = KeyDerivationFactory::create(gOpt.getKdPrf(), gOpt.getAnytun02Compat()); + KeyDerivation * kd = KeyDerivationFactory::create(gOpt.getKdPrf()); kd->init(gOpt.getKey(), gOpt.getSalt(), gOpt.getPassphrase()); kd->setRole(gOpt.getRole()); cLog.msg(Log::PRIO_NOTICE) << "added connection remote host " << remote_end; @@ -135,7 +135,7 @@ void sender(TunDevice* dev, PacketSource* src) try { - std::auto_ptr<Cipher> c(CipherFactory::create(gOpt.getCipher(), KD_OUTBOUND, gOpt.getAnytun02Compat())); + std::auto_ptr<Cipher> c(CipherFactory::create(gOpt.getCipher(), KD_OUTBOUND)); std::auto_ptr<AuthAlgo> a(AuthAlgoFactory::create(gOpt.getAuthAlgo(), KD_OUTBOUND) ); PlainPacket plain_packet(MAX_PACKET_LENGTH); @@ -224,7 +224,7 @@ void receiver(TunDevice* dev, PacketSource* src) try { - std::auto_ptr<Cipher> c(CipherFactory::create(gOpt.getCipher(), KD_INBOUND, gOpt.getAnytun02Compat())); + std::auto_ptr<Cipher> c(CipherFactory::create(gOpt.getCipher(), KD_INBOUND)); std::auto_ptr<AuthAlgo> a(AuthAlgoFactory::create(gOpt.getAuthAlgo(), KD_INBOUND)); EncryptedPacket encrypted_packet(MAX_PACKET_LENGTH, gOpt.getAuthTagLength()); @@ -431,9 +431,6 @@ int main(int argc, char* argv[]) gResolver.init(); #ifndef NO_CRYPT - if(gOpt.getAnytun02Compat()) - cLog.msg(Log::PRIO_NOTICE) << "enabling anytun 0.2.x crypto compatiblity mode"; - #ifndef USE_SSL_CRYPTO // this must be called before any other libgcrypt call if(!initLibGCrypt()) |