diff options
| author | millert@openbsd.org <millert@openbsd.org> | 2018-09-17 15:40:14 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-09-20 14:00:11 +1000 |
| commit | 5e532320e9e51de720d5f3cc2596e95d29f6e98f (patch) | |
| tree | 9e8a666d8c8f3c2badc1e0050b51552891a8e793 /dh.c | |
| parent | cce8cbe0ed7d1ba3a575310e0b63c193326ae616 (diff) | |
| download | openssh-git-5e532320e9e51de720d5f3cc2596e95d29f6e98f.tar.gz | |
upstream: When choosing a prime from the moduli file, avoid
re-using the linenum variable for something that is not a line number to
avoid the confusion that resulted in the bug in rev. 1.64. This also lets us
pass the actual linenum to parse_prime() so the error messages include the
correct line number. OK markus@ some time ago.
OpenBSD-Commit-ID: 4d8e5d3e924d6e8eb70053e3defa23c151a00084
Diffstat (limited to 'dh.c')
| -rw-r--r-- | dh.c | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: dh.c,v 1.66 2018/08/04 00:55:06 djm Exp $ */ +/* $OpenBSD: dh.c,v 1.68 2018/09/17 15:40:14 millert Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * @@ -188,15 +188,17 @@ choose_dh(int min, int wantbits, int max) logit("WARNING: no suitable primes in %s", _PATH_DH_MODULI); return (dh_new_group_fallback(max)); } + which = arc4random_uniform(bestcount); linenum = 0; - which = arc4random_uniform(bestcount); + bestcount = 0; while (getline(&line, &linesize, f) != -1) { + linenum++; if (!parse_prime(linenum, line, &dhg)) continue; if ((dhg.size > max || dhg.size < min) || dhg.size != best || - linenum++ != which) { + bestcount++ != which) { BN_clear_free(dhg.g); BN_clear_free(dhg.p); continue; @@ -206,9 +208,9 @@ choose_dh(int min, int wantbits, int max) free(line); line = NULL; fclose(f); - if (linenum != which+1) { - logit("WARNING: line %d disappeared in %s, giving up", - which, _PATH_DH_MODULI); + if (bestcount != which + 1) { + logit("WARNING: selected prime disappeared in %s, giving up", + _PATH_DH_MODULI); return (dh_new_group_fallback(max)); } |