Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fix crypt

Browse source
This commit is contained in:
kaetemi 2014-10-07 03:00:34 +02:00
parent f8e053c0f6
commit 1fa1ba390c
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
code/ryzom/common/src/game_share/crypt.cpp
View file

@ -18,16 +18,15 @@
#include "crypt.h" #include "crypt.h"
char * rz_crypt(register const char *key, register const char *setting); char * rz_crypt(register const char *key, register const char *setting, char *buf);
char *__crypt_sha512(const char *key, const char *setting, char *output); char *__crypt_sha512(const char *key, const char *setting, char *output);
// Crypts password using salt // Crypts password using salt
std::string CCrypt::crypt(const std::string& password, const std::string& salt) std::string CCrypt::crypt(const std::string& password, const std::string& salt)
{ {
std::string result = ::rz_crypt(password.c_str(), salt.c_str()); char buf[128];
return ::rz_crypt(password.c_str(), salt.c_str(), buf);
return result;
} }
@ -506,7 +505,7 @@ static char cryptresult[1+4+4+11+1]; /* encrypted result */
* Return a pointer to static data consisting of the "setting" * Return a pointer to static data consisting of the "setting"
* followed by an encryption produced by the "key" and "setting". * followed by an encryption produced by the "key" and "setting".
*/ */
char * rz_crypt(register const char *key, register const char *setting) { char * rz_crypt(register const char *key, register const char *setting, char *buf) {
register char *encp; register char *encp;
register long i; register long i;
register int t; register int t;
@ -521,10 +520,9 @@ char * rz_crypt(register const char *key, register const char *setting) {
return buff; return buff;
#endif #endif
static char buf[128]; if (setting[0] == '$' && setting[1] == '6') {
if (key[0] == '$' && key[1] == '6') { return __crypt_sha512(key, setting, buf);
return __crypt_sha512(key, setting, buf); }
}
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if ((t = 2*(unsigned char)(*key)) != 0) if ((t = 2*(unsigned char)(*key)) != 0)

2
code/ryzom/common/src/game_share/crypt.h
View file

@ -32,7 +32,7 @@ class CCrypt
public: public:
/// Crypts password using salt /// Crypts password using salt
static std::string crypt(const std::string& password, const std::string& salt); static std::string crypt(const std::string& password, const std::string& salt);
}; };

4
code/ryzom/common/src/game_share/crypt_sha512.cpp
View file

@ -365,9 +365,11 @@ char *__crypt_sha512(const char *key, const char *setting, char *output)
char *p, *q; char *p, *q;
p = sha512crypt(key, setting, output); p = sha512crypt(key, setting, output);
/* self test and stack cleanup */ /* self test and stack cleanup */
q = sha512crypt(testkey, testsetting, testbuf); q = sha512crypt(testkey, testsetting, testbuf);
if (!p || q != testbuf || memcmp(testbuf, testhash, sizeof testhash)) if (!p || q != testbuf || memcmp(testbuf, testhash, sizeof(testhash)))
return "*"; return "*";
return p; return p;
} }