Imported Upstream version 0.3.4

[anytun.git] / src / cipherFactory.cpp

diff --git a/src/cipherFactory.cpp b/src/cipherFactory.cpp
index e9f0292..836a517 100644 (file)
--- a/src/cipherFactory.cpp
+++ b/src/cipherFactory.cpp
@@ -11,14 +11,15 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 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 version 3 as
- *  published by the Free Software Foundation.
+ *  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
@@ -38,19 +39,22 @@
 
 Cipher* CipherFactory::create(std::string const& type, kd_dir_t dir)
 {
-  if(type == "null")
+  if(type == "null") {
     return new NullCipher();
+  }
 #ifndef NO_CRYPT
-  else if(type == "aes-ctr")
+  else if(type == "aes-ctr") {
     return new AesIcmCipher(dir);
-  else if(type == "aes-ctr-128")
+  } else if(type == "aes-ctr-128") {
     return new AesIcmCipher(dir, 128);
-  else if(type == "aes-ctr-192")
+  } else if(type == "aes-ctr-192") {
     return new AesIcmCipher(dir, 192);
-  else if(type == "aes-ctr-256")
+  } else if(type == "aes-ctr-256") {
     return new AesIcmCipher(dir, 256);
+  }
 #endif
-  else
+  else {
     throw std::invalid_argument("cipher not available");
+  }
 }