added openssl crypto class

5 files changed, 154 insertions, 2 deletions

diff --git a/src/Makefile b/src/Makefile
index cfcc34e..dae94d9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -53,6 +53,7 @@ ANYTUNOBJS := packetSource.o \
               cipher.o \
               cipherFactory.o \
               crypto/interface.o \
+              crypto/openssl.o \
               plainPacket.o \
               encryptedPacket.o \
               options.o \
diff --git a/src/crypto/interface.cpp b/src/crypto/interface.cpp
index 2d57d57..a38ad48 100644
--- a/src/crypto/interface.cpp
+++ b/src/crypto/interface.cpp
@@ -87,7 +87,7 @@ satp_prf_label_t Interface::convertLabel(kd_dir_t dir, role_t role, satp_prf_lab
 
 std::string Interface::printType()
 {
-  return "GenericKeyDerivation"; 
+  return ""; 
 }
 
 bool Interface::init()
diff --git a/src/crypto/interface.h b/src/crypto/interface.h
index 073201e..40e605a 100644
--- a/src/crypto/interface.h
+++ b/src/crypto/interface.h
@@ -72,7 +72,6 @@ namespace crypto {
   public:
     virtual ~Interface() {};
     // pure virtual
-    virtual void init(Buffer key, Buffer salt, std::string passphrase = "") = 0;
     virtual bool generatePacketKey( kd_dir_t dir, satp_prf_label_t label, seq_nr_t seq_nr, const Buffer& masterkey , const Buffer& mastersalt, Buffer& key) = 0;
     virtual void calcMasterKey(std::string passphrase, uint16_t length, Buffer& masterkey ) = 0;
     virtual void calcMasterSalt(std::string passphrase, uint16_t length, Buffer& mastersalt ) = 0;
diff --git a/src/crypto/openssl.cpp b/src/crypto/openssl.cpp
new file mode 100644
index 0000000..f433a3d
--- /dev/null
+++ b/src/crypto/openssl.cpp
@@ -0,0 +1,82 @@
+/*
+ *  anytun
+ *
+ *  The secure anycast tunneling protocol (satp) defines a protocol used
+ *  for communication between any combination of unicast and anycast
+ *  tunnel endpoints.  It has less protocol overhead than IPSec in Tunnel
+ *  mode and allows tunneling of every ETHER TYPE protocol (e.g.
+ *  ethernet, ip, arp ...). satp directly includes cryptography and
+ *  message authentication based on the methods used by SRTP.  It is
+ *  intended to deliver a generic, scaleable and secure solution for
+ *  tunneling and relaying of packets of any protocol.
+ *
+ *
+ *  Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl,
+ *                          Christian Pointner <satp@wirdorange.org>
+ *
+ *  This file is part of Anytun.
+ *
+ *  Anytun is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  Anytun is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL.  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so.  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version.  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ */
+
+#include "openssl.h"
+
+namespace crypto {
+
+bool Openssl::generatePacketKey( kd_dir_t dir, satp_prf_label_t label, seq_nr_t seq_nr, const Buffer& masterkey , const Buffer& mastersalt, Buffer& key)
+{
+  return true;
+}
+
+void Openssl::calcMasterKey(std::string passphrase, uint16_t length, Buffer& masterkey )
+{
+}
+
+void Openssl::calcMasterSalt(std::string passphrase, uint16_t length, Buffer& mastersalt )
+{
+}
+
+void Openssl::encrypt(const Buffer& key, PlainPacket& in, EncryptedPacket& out)
+{
+}
+
+void Openssl::decrypt(const Buffer& key, EncryptedPacket& in, PlainPacket& out)
+{
+}
+
+std::string Openssl::printType()
+{
+  return "Openssl";
+}
+
+//static
+bool Openssl::init()
+{
+  return true;
+}
+
+}
diff --git a/src/crypto/openssl.h b/src/crypto/openssl.h
new file mode 100644
index 0000000..ba5a340
--- /dev/null
+++ b/src/crypto/openssl.h
@@ -0,0 +1,70 @@
+/*
+ *  anytun
+ *
+ *  The secure anycast tunneling protocol (satp) defines a protocol used
+ *  for communication between any combination of unicast and anycast
+ *  tunnel endpoints.  It has less protocol overhead than IPSec in Tunnel
+ *  mode and allows tunneling of every ETHER TYPE protocol (e.g.
+ *  ethernet, ip, arp ...). satp directly includes cryptography and
+ *  message authentication based on the methods used by SRTP.  It is
+ *  intended to deliver a generic, scaleable and secure solution for
+ *  tunneling and relaying of packets of any protocol.
+ *
+ *
+ *  Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl,
+ *                          Christian Pointner <satp@wirdorange.org>
+ *
+ *  This file is part of Anytun.
+ *
+ *  Anytun is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  Anytun is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL.  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so.  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version.  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ */
+
+#ifndef ANYTUN_crypto_openssl_h_INCLUDED
+#define ANYTUN_crypto_openssl_h_INCLUDED
+
+#include "interface.h"
+
+namespace crypto {
+
+  class Openssl : Interface
+  {
+  public:
+    virtual ~Openssl() {};
+    // pure virtual
+    virtual bool generatePacketKey( kd_dir_t dir, satp_prf_label_t label, seq_nr_t seq_nr, const Buffer& masterkey , const Buffer& mastersalt, Buffer& key);
+    virtual void calcMasterKey(std::string passphrase, uint16_t length, Buffer& masterkey );
+    virtual void calcMasterSalt(std::string passphrase, uint16_t length, Buffer& mastersalt );
+    virtual void encrypt(const Buffer& key, PlainPacket& in, EncryptedPacket& out);
+    virtual void decrypt(const Buffer& key, EncryptedPacket& in, PlainPacket& out);
+    // virtual
+    virtual std::string printType();
+    //static
+    static bool init();
+  };
+};
+
+#endif