From 48d7b407e3c7b8bbd2758b90146dd08e06281745 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 14 Jul 2020 18:34:12 +0300
Subject: more logs for #2486

---
 src/core/stdssl/src/netlibssl.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/core/stdssl')

diff --git a/src/core/stdssl/src/netlibssl.cpp b/src/core/stdssl/src/netlibssl.cpp
index 8781e4ea20..0c16f9fdb5 100644
--- a/src/core/stdssl/src/netlibssl.cpp
+++ b/src/core/stdssl/src/netlibssl.cpp
@@ -754,13 +754,13 @@ int NetlibSslWrite(SslHandle *ssl, const char *buf, int num)
 static void* NetlibSslUnique(SslHandle *ssl, int *cbLen)
 {
 	*cbLen = 0;
-	if (!IsWinVer7Plus()) // XP doesn't support that functionality
-		return nullptr;
 
 	SEC_CHANNEL_BINDINGS bindings;
 	SECURITY_STATUS scRet = g_pSSPI->QueryContextAttributesW(&ssl->hContext, SECPKG_ATTR_UNIQUE_BINDINGS, &bindings);
-	if (scRet != SEC_E_OK)
+	if (scRet != SEC_E_OK) {
+		Netlib_Logf(nullptr, "NetlibSslUnique() failed with error %08x", scRet);
 		return nullptr;
+	}
 
 	LPBYTE pBuf = LPBYTE(bindings.dwInitiatorOffset);
 	if (bindings.dwInitiatorOffset == 0) {
@@ -772,8 +772,12 @@ static void* NetlibSslUnique(SslHandle *ssl, int *cbLen)
 
 	bindings = *(SEC_CHANNEL_BINDINGS *)bindings.dwInitiatorOffset;
 	pBuf += bindings.dwApplicationDataOffset;
-	if (memcmp(pBuf, "tls-unique:", 11))
+	if (memcmp(pBuf, "tls-unique:", 11)) {
+		CMStringA tmp(' ', bindings.cbApplicationDataLength * 2);
+		bin2hex(pBuf, bindings.cbApplicationDataLength, tmp.GetBuffer());
+		Netlib_Logf(nullptr, "NetlibSslUnique() failed: bad buffer: %s", tmp.c_str());
 		return nullptr;
+	}
 
 	pBuf += 11; bindings.cbApplicationDataLength -= 11;
 	*cbLen = bindings.cbApplicationDataLength;
-- 
cgit v1.2.3