diff options
| author | Tom Lane | 2006-05-21 20:22:23 +0000 |
|---|---|---|
| committer | Tom Lane | 2006-05-21 20:22:23 +0000 |
| commit | d0ac473b01270f2bbc614313ab82dacc7c086284 (patch) | |
| tree | 3d75d9b4db01dc97c8d9d5f67f2e31613103b8b8 | |
| parent | 15a4c384fe71e6e1d3870f427bef06d2e59ad524 (diff) | |
Fix errors in fortuna PRNG reseeding logic that could cause a predictable
session key to be selected by pgp_sym_encrypt() in some cases. This only
affects non-OpenSSL-using builds. Marko Kreen
| -rw-r--r-- | contrib/pgcrypto/fortuna.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/contrib/pgcrypto/fortuna.c b/contrib/pgcrypto/fortuna.c index 77204f96bf..6614b6653c 100644 --- a/contrib/pgcrypto/fortuna.c +++ b/contrib/pgcrypto/fortuna.c @@ -219,7 +219,7 @@ encrypt_counter(FState * st, uint8 *dst) * microseconds. */ static int -too_often(FState * st) +enough_time_passed(FState * st) { int ok; struct timeval tv; @@ -227,13 +227,22 @@ too_often(FState * st) gettimeofday(&tv, NULL); + /* check how much time has passed */ ok = 0; - if (tv.tv_sec != last->tv_sec) + if (tv.tv_sec > last->tv_sec + 1) ok = 1; + else if (tv.tv_sec == last->tv_sec + 1) + { + if (1000000 + tv.tv_usec - last->tv_usec >= RESEED_INTERVAL) + ok = 1; + } else if (tv.tv_usec - last->tv_usec >= RESEED_INTERVAL) ok = 1; - memcpy(last, &tv, sizeof(tv)); + /* reseed will happen, update last_reseed_time */ + if (ok) + memcpy(last, &tv, sizeof(tv)); + memset(&tv, 0, sizeof(tv)); return ok; @@ -372,7 +381,7 @@ extract_data(FState * st, unsigned count, uint8 *dst) unsigned block_nr = 0; /* Can we reseed? */ - if (st->pool0_bytes >= POOL0_FILL && !too_often(st)) + if (st->pool0_bytes >= POOL0_FILL && enough_time_passed(st)) reseed(st); /* Is counter initialized? */ |