nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Possible bugfix for 151: backport candidate.

Browse Source 
svn:r4318
This commit is contained in:
Nick Mathewson 2005-06-06 20:02:09 +00:00
parent baa10cbbfa
commit 5420aed38e
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/crypto.c
View File

@ -1425,25 +1425,19 @@ int crypto_seed_rng(void)
char buf[DIGEST_LEN+1]; char buf[DIGEST_LEN+1];
if (!provider_set) { if (!provider_set) {
if (!CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, CRYPT_MACHINE_KEYSET)) { if (!CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
if (GetLastError() != NTE_BAD_KEYSET) { if (GetLastError() != NTE_BAD_KEYSET) {
log_fn(LOG_ERR,"Can't get CryptoAPI provider [1]"); log_fn(LOG_ERR,"Can't get CryptoAPI provider [1]");
return -1; return -1;
} }
/* Yes, we need to try it twice. */
if (!CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL,
CRYPT_MACHINE_KEYSET | CRYPT_NEWKEYSET)) {
log_fn(LOG_ERR,"Can't get CryptoAPI provider [2], error code: %x", GetLastError());
return -1;
}
} }
provider_set = 1; provider_set = 1;
} }
if (!CryptGenRandom(provider, DIGEST_LEN, buf)) { if (!CryptGenRandom(provider, sizeof(buf), buf)) {
log_fn(LOG_ERR,"Can't get entropy from CryptoAPI."); log_fn(LOG_ERR,"Can't get entropy from CryptoAPI.");
return -1; return -1;
} }
RAND_seed(buf, DIGEST_LEN); RAND_seed(buf, sizeof(buf));
/* And add the current screen state to the entropy pool for /* And add the current screen state to the entropy pool for
* good measure. */ * good measure. */
RAND_screen(); RAND_screen();
@ -1460,13 +1454,13 @@ int crypto_seed_rng(void)
fd = open(filenames[i], O_RDONLY, 0); fd = open(filenames[i], O_RDONLY, 0);
if (fd<0) continue; if (fd<0) continue;
log_fn(LOG_INFO, "Seeding RNG from %s", filenames[i]); log_fn(LOG_INFO, "Seeding RNG from %s", filenames[i]);
n = read(fd, buf, DIGEST_LEN); n = read_all(fd, buf, sizeof(buf), 0);
close(fd); close(fd);
if (n != DIGEST_LEN) { if (n != sizeof(buf)) {
log_fn(LOG_WARN, "Error reading from entropy source"); log_fn(LOG_WARN, "Error reading from entropy source");
return -1; return -1;
} }
RAND_seed(buf, DIGEST_LEN); RAND_seed(buf, sizeof(buf));
return 0; return 0;
} }