summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOthmar Gsenger <otti@anytun.org>2008-02-04 22:00:02 +0000
committerOthmar Gsenger <otti@anytun.org>2008-02-04 22:00:02 +0000
commit910a69fc06f1a43c18ab8c5e4119c71629992767 (patch)
treef358a3203232a47fcd404d262e0e4a155af2ff7c
parenttest no keyderivation (diff)
readded kd generate
-rw-r--r--anytun.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/anytun.cpp b/anytun.cpp
index 1b69b11..ebff073 100644
--- a/anytun.cpp
+++ b/anytun.cpp
@@ -164,9 +164,9 @@ void* sender(void* p)
plain_packet.setPayloadType(0);
// encrypt packet
-// conn.kd_.generate(LABEL_SATP_ENCRYPTION, conn.seq_nr_, session_key, session_key.getLength());
-// conn.kd_.generate(LABEL_SATP_SALT, conn.seq_nr_, session_salt, session_salt.getLength());
-// conn.kd_.generate(LABEL_SATP_MSG_AUTH, packet.getSeqNr(), session_auth_key, session_auth_key.getLength());
+ conn.kd_.generate(LABEL_SATP_ENCRYPTION, conn.seq_nr_, session_key, session_key.getLength());
+ conn.kd_.generate(LABEL_SATP_SALT, conn.seq_nr_, session_salt, session_salt.getLength());
+ conn.kd_.generate(LABEL_SATP_MSG_AUTH, packet.getSeqNr(), session_auth_key, session_auth_key.getLength());
c->setKey(session_key);
c->setSalt(session_salt);
@@ -274,8 +274,8 @@ void* receiver(void* p)
continue;
// decrypt packet
-// conn.kd_.generate(LABEL_SATP_ENCRYPTION, packet.getSeqNr(), session_key, session_key.getLength());
-// conn.kd_.generate(LABEL_SATP_SALT, packet.getSeqNr(), session_salt, session_salt.getLength());
+ conn.kd_.generate(LABEL_SATP_ENCRYPTION, packet.getSeqNr(), session_key, session_key.getLength());
+ conn.kd_.generate(LABEL_SATP_SALT, packet.getSeqNr(), session_salt, session_salt.getLength());
c->setKey(session_key);
c->setSalt(session_salt);
c->decrypt(packet, plain_packet);