From f1ef7b2a3875e13de3a6b835951ec319a4513f81 Mon Sep 17 00:00:00 2001
From: Othmar Gsenger <otti@anytun.org>
Date: Fri, 6 Mar 2015 20:02:19 +0000
Subject: bugfix wrong pointer

---
 src/cipher.cpp           |  4 ++--
 src/crypto/interface.cpp |  4 ++--
 src/unittest.cpp         | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/cipher.cpp b/src/cipher.cpp
index 52a2543..8a1aba4 100644
--- a/src/cipher.cpp
+++ b/src/cipher.cpp
@@ -61,7 +61,7 @@
 
 void Cipher::encrypt(KeyDerivation& kd, PlainPacket& in, EncryptedPacket& out, seq_nr_t seq_nr, sender_id_t sender_id, mux_t mux)
 {
-  uint32_t len = cipher(kd, in, in.getLength(), out.getPayload(), out.getPayloadLength(), seq_nr, sender_id, mux);
+  uint32_t len = cipher(kd, in.getPayload(), in.getLength(), out.getPayload(), out.getPayloadLength(), seq_nr, sender_id, mux);
   out.setSenderId(sender_id);
   out.setSeqNr(seq_nr);
   out.setMux(mux);
@@ -70,7 +70,7 @@ void Cipher::encrypt(KeyDerivation& kd, PlainPacket& in, EncryptedPacket& out, s
 
 void Cipher::decrypt(KeyDerivation& kd, EncryptedPacket& in, PlainPacket& out)
 {
-  uint32_t len = decipher(kd, in.getPayload() , in.getPayloadLength(), out, out.getLength(), in.getSeqNr(), in.getSenderId(), in.getMux());
+  uint32_t len = decipher(kd, in.getPayload() , in.getPayloadLength(), out.getPayload(), out.getLength(), in.getSeqNr(), in.getSenderId(), in.getMux());
   out.setLength(len);
 }
 
diff --git a/src/crypto/interface.cpp b/src/crypto/interface.cpp
index c11e382..3afa03d 100644
--- a/src/crypto/interface.cpp
+++ b/src/crypto/interface.cpp
@@ -55,7 +55,7 @@ Interface::~Interface()
 
 void Interface::encrypt(PlainPacket& in, EncryptedPacket& out, const Buffer& masterkey, const Buffer& mastersalt, role_t role, seq_nr_t seq_nr, sender_id_t sender_id, mux_t mux)
 {
-  uint32_t len = cipher(in, in.getLength(), out.getPayload(), out.getPayloadLength(), masterkey, mastersalt, role, seq_nr, sender_id, mux);
+  uint32_t len = cipher(in.getPayload(), in.getLength(), out.getPayload(), out.getPayloadLength(), masterkey, mastersalt, role, seq_nr, sender_id, mux);
   out.setSenderId(sender_id);
   out.setSeqNr(seq_nr);
   out.setMux(mux);
@@ -64,7 +64,7 @@ void Interface::encrypt(PlainPacket& in, EncryptedPacket& out, const Buffer& mas
 
 void Interface::decrypt(EncryptedPacket& in, PlainPacket& out, const Buffer& masterkey, const Buffer& mastersalt, role_t role)
 {
-  uint32_t len = decipher(in.getPayload() , in.getPayloadLength(), out, out.getLength(), masterkey, mastersalt, role, in.getSeqNr(), in.getSenderId(), in.getMux());
+  uint32_t len = decipher(in.getPayload() , in.getPayloadLength(), out.getPayload(), out.getLength(), masterkey, mastersalt, role, in.getSeqNr(), in.getSenderId(), in.getMux());
   out.setLength(len);
 }
 
diff --git a/src/unittest.cpp b/src/unittest.cpp
index a9e6bf9..2aa1edc 100644
--- a/src/unittest.cpp
+++ b/src/unittest.cpp
@@ -166,8 +166,8 @@ void testCrypt()
 
 
     c->decrypt(*kd, encrypted_packet, plain_packet);
-    if (memcmp(plain_packet.getPayload(), test_text, sizeof(test_text))) {
-      std::cerr << "crypto test failed" << std::endl;
+    if (int pos = memcmp(plain_packet.getPayload(), test_text, sizeof(test_text))) {
+      std::cerr << "crypto test failed at position "<< pos << std::endl;
       std::cout << test_text << std::endl;
       ssize_t len = write(0, plain_packet.getPayload(), plain_packet.getLength());
       if (len)
@@ -187,8 +187,8 @@ void testCrypt()
       //exit(-1);
     }
     cnew->decrypt(encrypted_packet, plain_packet, masterkey, mastersalt, ROLE_RIGHT );
-    if (memcmp(plain_packet.getPayload(), test_text, sizeof(test_text))) {
-      std::cerr << "crypto test failed" << std::endl;
+    if (int pos = memcmp(plain_packet.getPayload(), test_text, sizeof(test_text))) {
+      std::cerr << "crypto test failed at position "<< pos << std::endl;
       std::cout << test_text << std::endl;
       ssize_t len = write(0, plain_packet.getPayload(), plain_packet.getLength());
       if (len)
@@ -234,8 +234,8 @@ void newCrypt()
     }
 
     cnew->decrypt(encrypted_packet, plain_packet, masterkey, mastersalt, ROLE_RIGHT );
-    if (memcmp(plain_packet.getPayload(), test_text, sizeof(test_text))) {
-      std::cerr << "crypto test failed" << std::endl;
+    if (int pos = memcmp(plain_packet.getPayload(), test_text, sizeof(test_text))) {
+      std::cerr << "crypto test failed at position "<< pos << std::endl;
       std::cout << test_text << std::endl;
       ssize_t len = write(0, plain_packet.getPayload(), plain_packet.getLength());
       if (len)
-- 
cgit v1.2.3