From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Fri, 20 May 2011 20:37:13 +0000 (+0100)
Subject: Passwords - a few corrections to the previous commit
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=52d857cf1527948e1db5eead457e51b6741de8a2;p=zefram%2Fminetest%2Fminetest_engine.git

Passwords - a few corrections to the previous commit
---

diff --git a/src/main.cpp b/src/main.cpp
index 0b181a36..184643b9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1448,6 +1448,7 @@ int main(int argc, char *argv[])
 						sha1->addBytes(slt.c_str(), slt.length());
 						unsigned char *digest = sha1->getDigest();
 						password = base64_encode(digest, 20);
+						free(digest);
 				}
 				else
 				{
diff --git a/src/server.cpp b/src/server.cpp
index 051ca85f..b5cb48a3 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1780,7 +1780,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 		if(datasize == 2+1+PLAYERNAME_SIZE)
 		{
 			// old version - assume blank password
-			*password = 0;
+			password[0] = 0;
 		}
 		else
 		{
diff --git a/src/sha1.cpp b/src/sha1.cpp
index 93df1096..98180adc 100644
--- a/src/sha1.cpp
+++ b/src/sha1.cpp
@@ -4,8 +4,24 @@ Copyright (c) 2005 Michael D. Leonhard
 
 http://tamale.net/
 
-This file is licensed under the terms described in the
-accompanying LICENSE file.
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+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>
diff --git a/src/sha1.h b/src/sha1.h
index 2f92fe8d..c0494737 100644
--- a/src/sha1.h
+++ b/src/sha1.h
@@ -4,8 +4,24 @@ Copyright (c) 2005 Michael D. Leonhard
 
 http://tamale.net/
 
-This file is licensed under the terms described in the
-accompanying LICENSE file.
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+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