diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-09 10:57:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-09 10:57:19 -0400 |
| commit | 90bce702ba61c3339e55cfedb4cc6f355b3049c7 (patch) | |
| tree | e77b8995eee6e85dfa8e4cede4e1fc3c7fdd3455 | |
| parent | e5f9f287ced36e18241e250d4b63603b9c4f006f (diff) | |
| parent | 42350968a9d7afb1259dfdfb4d4ec5f9aa806711 (diff) | |
| download | tor-90bce702ba61c3339e55cfedb4cc6f355b3049c7.tar.gz tor-90bce702ba61c3339e55cfedb4cc6f355b3049c7.zip | |
Merge remote-tracking branch 'public/bug10816'
| -rw-r--r-- | changes/bug10816 | 6 | ||||
| -rw-r--r-- | src/common/crypto.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/changes/bug10816 b/changes/bug10816 new file mode 100644 index 0000000000..1185f3c2d6 --- /dev/null +++ b/changes/bug10816 @@ -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. + diff --git a/src/common/crypto.c b/src/common/crypto.c index fa91f6dd82..f128336e50 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -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; } |