diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-01-29 19:39:44 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-01-29 19:56:35 +0100 |
commit | c41269058f2e9b2d612099ac97fa7a74a38bd584 (patch) | |
tree | 377356daf3a727aa32fdf3021ea5bdc0849ffbc2 | |
parent | 0ef8ff7af3e260576a066f27b24dc79ea8515e72 (diff) | |
download | manaserv-c41269058f2e9b2d612099ac97fa7a74a38bd584.tar.gz manaserv-c41269058f2e9b2d612099ac97fa7a74a38bd584.tar.bz2 manaserv-c41269058f2e9b2d612099ac97fa7a74a38bd584.tar.xz manaserv-c41269058f2e9b2d612099ac97fa7a74a38bd584.zip |
Removed unused createRandomPassword function
Reviewed-by: Erik Schilling
-rw-r--r-- | accountserver.cbp | 2 | ||||
-rw-r--r-- | src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/utils/encryption.cpp | 61 | ||||
-rw-r--r-- | src/utils/encryption.h | 36 |
4 files changed, 0 insertions, 101 deletions
diff --git a/accountserver.cbp b/accountserver.cbp index df1d6021..130a2e9d 100644 --- a/accountserver.cbp +++ b/accountserver.cbp @@ -197,8 +197,6 @@ <Unit filename="src\serialize\characterdata.h" /> <Unit filename="src\utils\base64.cpp" /> <Unit filename="src\utils\base64.h" /> - <Unit filename="src\utils\encryption.cpp" /> - <Unit filename="src\utils\encryption.h" /> <Unit filename="src\utils\functors.h" /> <Unit filename="src\utils\logger.cpp" /> <Unit filename="src\utils\logger.h" /> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 03b2b5ce..1b5ad942 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -179,8 +179,6 @@ SET(SRCS_MANASERVACCOUNT dal/recordset.h dal/recordset.cpp utils/functors.h - utils/encryption.h - utils/encryption.cpp utils/sha256.h utils/sha256.cpp utils/throwerror.h diff --git a/src/utils/encryption.cpp b/src/utils/encryption.cpp deleted file mode 100644 index 9062248f..00000000 --- a/src/utils/encryption.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* - * The Mana Server - * Copyright (C) 2008-2010 The Mana World Development Team - * - * This file is part of The Mana Server. - * - * The Mana Server 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 2 of the License, or - * any later version. - * - * The Mana Server 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 The Mana Server. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "encryption.h" - -#include <time.h> -#include <stdlib.h> - -using namespace Encryption; - -static char getRandomCharacter() -{ - // Taking a number of character taken between 33 and 127 - // (every normal characters from ASCII table). - int number = (rand() % 94) + 33; - - // Those characters are dodged to ease user input and avoid database - // breaks: " ' , ` \ ^ * / ~ | - if (number == 34 || number == 39 || number == 42 || number == 44 || - number == 47 || number == 92 || number == 94 || number == 96 || - number == 124 || number == 126) - number++; - - return (char) number; -} - -/** - * Using this function, the random salt changes at every second. - */ -std::string createRandomPassword() -{ - std::string result; - - // Ititializing random seed. - srand(time(NULL)); - - // Taking a number of character taken between 20 and 30. - int characterNumber = (rand() % 10) + 20; - - for (int a = 1; a < characterNumber; a++) - result += getRandomCharacter(); - - return result; -} diff --git a/src/utils/encryption.h b/src/utils/encryption.h deleted file mode 100644 index a2262eda..00000000 --- a/src/utils/encryption.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The Mana Server - * Copyright (C) 2008-2010 The Mana World Development Team - * - * This file is part of The Mana Server. - * - * The Mana Server 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 2 of the License, or - * any later version. - * - * The Mana Server 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 The Mana Server. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef UTILS_ENCRYPTION_H -#define UTILS_ENCRYPTION_H - -#include <string> - -namespace Encryption { - -/** - * Creates a random string, suitable for a user to type, - * and that doesn't break a database - */ -std::string createRandomPassword(); - -} - -#endif // UTILS_ENCRYPTION_H |