From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 25 Nov 2011 11:50:28 +0000 (+0000)
Subject: fix a bug in handling "accept" for crypto connections
X-Git-Tag: xonotic-v0.6.0~102^2~51
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c773e8c87a44d70937a150554b625ee2d148b1a8;p=xonotic%2Fdarkplaces.git

fix a bug in handling "accept" for crypto connections

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11568 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/crypto.c b/crypto.c
index 2847e048..e503102e 100644
--- a/crypto.c
+++ b/crypto.c
@@ -2017,7 +2017,7 @@ int Crypto_ClientParsePacket(const char *data_in, size_t len_in, char *data_out,
 	{
 		int wantserverid = -1;
 		Crypto_RetrieveHostKey(&cls.connect_address, &wantserverid, NULL, 0, NULL, 0, NULL);
-		//if(!crypto || !crypto->authenticated)
+		if(!crypto || !crypto->authenticated) // we ALSO get here if we are using an encrypted connection, so let's rule this out
 		{
 			if(wantserverid >= 0)
 				return Crypto_ClientError(data_out, len_out, "Server tried an unauthenticated connection even though a host key is present");