nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Gracefully degrade in the absence of CryptProtectMemory.

Browse Source 
XP doesn't have it, and I think having connection sharing work without
its privacy enhancement is better than having it not work at all.

[originally from svn r10087]
This commit is contained in:
Simon Tatham 2013-11-18 19:07:58 +00:00
parent b12fbeffd6
commit e43b6203ec
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
windows/winshare.c
View File

@ -56,11 +56,17 @@ static char *obfuscate_name(const char *realname)
* key every time since its API permits returning more data than
* was input, so calling _that_ and hashing the output would not
* be stable.)
*
* We don't worry too much if this doesn't work for some reason.
* Omitting this step still has _some_ privacy value (in that
* another user can test-hash things to confirm guesses as to
* where you might be connecting to, but cannot invert SHA-256 in
* the absence of any plausible guess). So we don't abort if we
* can't call CryptProtectMemory at all, or if it fails.
*/
if (!p_CryptProtectMemory(cryptdata, cryptlen,
CRYPTPROTECTMEMORY_CROSS_PROCESS)) {
return NULL;
}
if (got_crypt())
p_CryptProtectMemory(cryptdata, cryptlen,
CRYPTPROTECTMEMORY_CROSS_PROCESS);
/*
* We don't want to give away the length of the hostname either,
@ -111,11 +117,6 @@ int platform_ssh_share(const char *pi_name, Conf *conf,
PACL acl;
PSID networksid;
if (!got_crypt()) {
*logtext = dupprintf("Unable to load crypt32.dll");
return SHARE_NONE;
}
/*
* Transform the platform-independent version of the connection
* identifier into the obfuscated version we'll use for our