nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug10816'

Browse Source
This commit is contained in:
Nick Mathewson 2014-10-09 10:57:19 -04:00
commit 90bce702ba
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug10816 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes (windows):
- Remove code to special-case handling of NTE_BAD_KEYSET when
acquiring windows CryptoAPI context. This error can't actually
occur for the parameters we're providing. Fixes bug 10816;
bugfix on 0.0.2pre26.

6
src/common/crypto.c
View File

@ -2454,10 +2454,8 @@ crypto_strongest_rand(uint8_t *out, size_t out_len)
if (!provider_set) {
if (!CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL,
CRYPT_VERIFYCONTEXT)) {
if ((unsigned long)GetLastError() != (unsigned long)NTE_BAD_KEYSET) {
log_warn(LD_CRYPTO, "Can't get CryptoAPI provider [1]");
return -1;
}
log_warn(LD_CRYPTO, "Can't get CryptoAPI provider [1]");
return -1;
}
provider_set = 1;
}