Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 01:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Passwords - a few corrections to the previous commit

Browse Source
This commit is contained in:
Ciaran Gultnieks 2011-05-20 21:37:13 +01:00
parent d4d49ee8f4
commit 52d857cf15
4 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.cpp
View File

@ -1448,6 +1448,7 @@ int main(int argc, char *argv[])
sha1->addBytes(slt.c_str(), slt.length()); sha1->addBytes(slt.c_str(), slt.length());
unsigned char *digest = sha1->getDigest(); unsigned char *digest = sha1->getDigest();
password = base64_encode(digest, 20); password = base64_encode(digest, 20);
free(digest);
} }
else else
{ {

2
src/server.cpp
View File

@ -1780,7 +1780,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
if(datasize == 2+1+PLAYERNAME_SIZE) if(datasize == 2+1+PLAYERNAME_SIZE)
{ {
// old version - assume blank password // old version - assume blank password
*password = 0; password[0] = 0;
} }
else else
{ {

20
src/sha1.cpp
View File

@ -4,8 +4,24 @@ Copyright (c) 2005 Michael D. Leonhard
http://tamale.net/ http://tamale.net/
This file is licensed under the terms described in the Permission is hereby granted, free of charge, to any person obtaining a copy of
accompanying LICENSE file. this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/ */
#include <stdio.h> #include <stdio.h>

20
src/sha1.h
View File

@ -4,8 +4,24 @@ Copyright (c) 2005 Michael D. Leonhard
http://tamale.net/ http://tamale.net/
This file is licensed under the terms described in the Permission is hereby granted, free of charge, to any person obtaining a copy of
accompanying LICENSE file. this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/ */
#ifndef SHA1_HEADER #ifndef SHA1_HEADER