X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FkeyDerivationFactory.cpp;h=0f3c40e278930aa5b536cd7341ccccd05a63527e;hb=65944fb7a518dc659bacaf80cf235a0352fc6a7e;hp=d325c354ae6367060f2023802b05f1f9119fe900;hpb=bb834fe0ed7a38b724f49b944adb801634eb6194;p=anytun.git

diff --git a/src/keyDerivationFactory.cpp b/src/keyDerivationFactory.cpp
index d325c35..0f3c40e 100644
--- a/src/keyDerivationFactory.cpp
+++ b/src/keyDerivationFactory.cpp
@@ -6,12 +6,12 @@
  *  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 methodes used by SRTP.  It is
+ *  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-2009 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
@@ -27,7 +27,20 @@
  *  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/>.
+ *  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 <string>
@@ -39,19 +52,22 @@
 
 KeyDerivation* KeyDerivationFactory::create(std::string const& type)
 {
-  if(type == "null")
+  if(type == "null") {
     return new NullKeyDerivation();
+  }
 #ifndef NO_CRYPT
-  else if(type == "aes-ctr")
+  else if(type == "aes-ctr") {
     return new AesIcmKeyDerivation();
-  else if(type == "aes-ctr-128")
+  } else if(type == "aes-ctr-128") {
     return new AesIcmKeyDerivation(128);
-  else if(type == "aes-ctr-192")
+  } else if(type == "aes-ctr-192") {
     return new AesIcmKeyDerivation(192);
-  else if(type == "aes-ctr-256")
+  } else if(type == "aes-ctr-256") {
     return new AesIcmKeyDerivation(256);
+  }
 #endif
-  else
+  else {
     throw std::invalid_argument("key derivation prf not available");
+  }
 }