projects
/
anytun.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.3.4
[anytun.git]
/
src
/
keyDerivationFactory.cpp
diff --git
a/src/keyDerivationFactory.cpp
b/src/keyDerivationFactory.cpp
index
d325c35
..
a4cbf1c
100644
(file)
--- a/
src/keyDerivationFactory.cpp
+++ b/
src/keyDerivationFactory.cpp
@@
-11,7
+11,7
@@
* tunneling and relaying of packets of any protocol.
*
*
* tunneling and relaying of packets of any protocol.
*
*
- * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
+ * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
* Christian Pointner <satp@wirdorange.org>
*
* This file is part of Anytun.
* Christian Pointner <satp@wirdorange.org>
*
* This file is part of Anytun.
@@
-39,19
+39,22
@@
KeyDerivation* KeyDerivationFactory::create(std::string const& type)
{
KeyDerivation* KeyDerivationFactory::create(std::string const& type)
{
- if(type == "null")
+ if(type == "null")
{
return new NullKeyDerivation();
return new NullKeyDerivation();
+ }
#ifndef NO_CRYPT
#ifndef NO_CRYPT
- else if(type == "aes-ctr")
+ else if(type == "aes-ctr")
{
return new AesIcmKeyDerivation();
return new AesIcmKeyDerivation();
- else if(type == "aes-ctr-128")
+ } else if(type == "aes-ctr-128") {
return new AesIcmKeyDerivation(128);
return new AesIcmKeyDerivation(128);
- else if(type == "aes-ctr-192")
+ } else if(type == "aes-ctr-192") {
return new AesIcmKeyDerivation(192);
return new AesIcmKeyDerivation(192);
- else if(type == "aes-ctr-256")
+ } else if(type == "aes-ctr-256") {
return new AesIcmKeyDerivation(256);
return new AesIcmKeyDerivation(256);
+ }
#endif
#endif
- else
+ else
{
throw std::invalid_argument("key derivation prf not available");
throw std::invalid_argument("key derivation prf not available");
+ }
}
}