Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hacker <dd0t@users.sourceforge.net>2014-10-03 03:19:29 +0400
committerStefan Hacker <dd0t@users.sourceforge.net>2014-10-03 03:19:29 +0400
commit5131d9e3036bb7de94967dd026f2c7f4ec91645d (patch)
treec166aa7a4b93d7581a67038fcbd999c1ed1a9c02 /src/murmur/murmur.pro
parent813aceb854949a863e095930423d8d49793e4be8 (diff)
Review and refactor of PBKDF2 support patch.
* Adjusted to coding guidelines * Pulled out PBKDF2 functionality into own class * Make benchmark a best of N approach with guaranteed minimum * Fixed broken database migration code. Don't try to alter tables and instead rely on them being re-created with the new fields. * Fixed some typos in ini. Also move to the setting to the end so ppl. don't get the idea they have to change this. * Chose a scarier name for the plain hash function * Use int instead of size_t for iteration counts as it is the datatype used in the OpenSSL API. Otherwise we just have to much pain with constantly converting and might expose ourselves to size issues in the future. * Moved new UserInfo enum entry to the end as to preserve the order
Diffstat (limited to 'src/murmur/murmur.pro')
-rw-r--r--src/murmur/murmur.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro
index 91f0c6968..194ae31ce 100644
--- a/src/murmur/murmur.pro
+++ b/src/murmur/murmur.pro
@@ -16,8 +16,8 @@ TARGET = murmur
DBFILE = murmur.db
LANGUAGE = C++
FORMS =
-HEADERS *= Server.h ServerUser.h Meta.h
-SOURCES *= main.cpp Server.cpp ServerUser.cpp ServerDB.cpp Register.cpp Cert.cpp Messages.cpp Meta.cpp RPC.cpp
+HEADERS *= Server.h ServerUser.h Meta.h PBKDF2.h
+SOURCES *= main.cpp Server.cpp ServerUser.cpp ServerDB.cpp Register.cpp Cert.cpp Messages.cpp Meta.cpp RPC.cpp PBKDF2.cpp
DIST = DBus.h ServerDB.h ../../icons/murmur.ico Murmur.ice MurmurI.h MurmurIceWrapper.cpp murmur.plist
PRECOMPILED_HEADER = murmur_pch.h