[iortcw] 133/152: MP: Always use 16 character keylength when calculating GUID

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.5a
in repository iortcw.

commit 119ef0ba50417c76792081b9581e9598c0f448cb
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sun Oct 16 08:58:34 2016 -0400

    MP: Always use 16 character keylength when calculating GUID
---
 MP/code/client/cl_ui.c  | 4 ++--
 MP/code/qcommon/pbmd5.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MP/code/client/cl_ui.c b/MP/code/client/cl_ui.c
index 9fc059e..94e7984 100644
--- a/MP/code/client/cl_ui.c
+++ b/MP/code/client/cl_ui.c
@@ -673,11 +673,11 @@ static void CLUI_SetCDKey( char *buf ) {
 	if ( UI_usesUniqueCDKey() && fs && fs->string[0] != 0 ) {
 		memcpy( &cl_cdkey[16], buf, 16 );
 		cl_cdkey[32] = 0;
-		// set the flag so the fle will be written at the next opportunity
+		// set the flag so the file will be written at the next opportunity
 		cvar_modifiedFlags |= CVAR_ARCHIVE;
 	} else {
 		memcpy( cl_cdkey, buf, 16 );
-		// set the flag so the fle will be written at the next opportunity
+		// set the flag so the file will be written at the next opportunity
 		cvar_modifiedFlags |= CVAR_ARCHIVE;
 	}
 }
diff --git a/MP/code/qcommon/pbmd5.c b/MP/code/qcommon/pbmd5.c
index 4eddc0d..c059ebc 100644
--- a/MP/code/qcommon/pbmd5.c
+++ b/MP/code/qcommon/pbmd5.c
@@ -323,16 +323,16 @@ char *Com_PBMD5File( char *key ) {
 
 	k = key;
 
-//	Com_DPrintf( "GUID of cdkey %s: ", k );
+//	Com_DPrintf( "cdkey: %s\n", k );
 
 	// Process first seed
-	k = do_md5x( k, strlen( k ), get_num( "0x00b684a3", NULL ) );
+	k = do_md5x( k, 16, get_num( "0x00b684a3", NULL ) );
 
 	// Process second seed
 	k = do_md5x( k, 32, get_num( "0x00051a56", NULL ) );
 
 	guid = Q_strupr( k );
-//	Com_DPrintf( "%s\n", guid );
+//	Com_DPrintf( "guid: %s\n", guid );
 
 	return guid;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git