diff options
author | Simon Howard | 2012-10-28 23:45:08 +0000 |
---|---|---|
committer | Simon Howard | 2012-10-28 23:45:08 +0000 |
commit | 993315afc4b1fddaf8952e7e55d1373b5052dd7c (patch) | |
tree | 94aa07d101ddced8404ceaa92ce051ed17fe2a88 /src/net_gui.c | |
parent | a1b2ce54d02823aa85c7df6aa016c567185451ae (diff) | |
parent | ad11652dcd8e0923432ad272e6535276c51d39eb (diff) | |
download | chocolate-doom-993315afc4b1fddaf8952e7e55d1373b5052dd7c.tar.gz chocolate-doom-993315afc4b1fddaf8952e7e55d1373b5052dd7c.tar.bz2 chocolate-doom-993315afc4b1fddaf8952e7e55d1373b5052dd7c.zip |
Merge from trunk.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2537
Diffstat (limited to 'src/net_gui.c')
-rw-r--r-- | src/net_gui.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/net_gui.c b/src/net_gui.c index 7fff33f6..14d0d943 100644 --- a/src/net_gui.c +++ b/src/net_gui.c @@ -184,13 +184,13 @@ static void UpdateGUI(net_gamesettings_t *settings) TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, startgame); } -static void PrintMD5Digest(char *s, byte *digest) +static void PrintSHA1Digest(char *s, byte *digest) { unsigned int i; printf("%s: ", s); - for (i=0; i<sizeof(md5_digest_t); ++i) + for (i=0; i<sizeof(sha1_digest_t); ++i) { printf("%02x", digest[i]); } @@ -198,7 +198,7 @@ static void PrintMD5Digest(char *s, byte *digest) printf("\n"); } -static void CheckMD5Sums(void) +static void CheckSHA1Sums(void) { boolean correct_wad, correct_deh; boolean same_freedoom; @@ -209,12 +209,12 @@ static void CheckMD5Sums(void) return; } - correct_wad = memcmp(net_local_wad_md5sum, - net_client_wait_data.wad_md5sum, - sizeof(md5_digest_t)) == 0; - correct_deh = memcmp(net_local_deh_md5sum, - net_client_wait_data.deh_md5sum, - sizeof(md5_digest_t)) == 0; + correct_wad = memcmp(net_local_wad_sha1sum, + net_client_wait_data.wad_sha1sum, + sizeof(sha1_digest_t)) == 0; + correct_deh = memcmp(net_local_deh_sha1sum, + net_client_wait_data.deh_sha1sum, + sizeof(sha1_digest_t)) == 0; same_freedoom = net_client_wait_data.is_freedoom == net_local_is_freedoom; if (correct_wad && correct_deh && same_freedoom) @@ -224,9 +224,9 @@ static void CheckMD5Sums(void) if (!correct_wad) { - printf("Warning: WAD MD5 does not match server:\n"); - PrintMD5Digest("Local", net_local_wad_md5sum); - PrintMD5Digest("Server", net_client_wait_data.wad_md5sum); + printf("Warning: WAD SHA1 does not match server:\n"); + PrintSHA1Digest("Local", net_local_wad_sha1sum); + PrintSHA1Digest("Server", net_client_wait_data.wad_sha1sum); } if (!same_freedoom) @@ -239,9 +239,9 @@ static void CheckMD5Sums(void) if (!correct_deh) { - printf("Warning: Dehacked MD5 does not match server:\n"); - PrintMD5Digest("Local", net_local_deh_md5sum); - PrintMD5Digest("Server", net_client_wait_data.deh_md5sum); + printf("Warning: Dehacked SHA1 does not match server:\n"); + PrintSHA1Digest("Local", net_local_deh_sha1sum); + PrintSHA1Digest("Server", net_client_wait_data.deh_sha1sum); } window = TXT_NewWindow("WARNING"); @@ -308,7 +308,7 @@ void NET_WaitForStart(net_gamesettings_t *settings) while (net_waiting_for_start) { UpdateGUI(settings); - CheckMD5Sums(); + CheckSHA1Sums(); TXT_DispatchEvents(); TXT_DrawDesktop(); |