From 6f56fe4b9578b0627667f8bce69d4d938a88324c Mon Sep 17 00:00:00 2001 From: "millert@openbsd.org" Date: Tue, 26 Jun 2018 11:23:59 +0000 Subject: [PATCH] upstream: Fix "WARNING: line 6 disappeared in /etc/moduli, giving up" when choosing a prime. An extra increment of linenum snuck in as part of the conversion to getline(). OK djm@ markus@ OpenBSD-Commit-ID: 0019225cb52ed621b71cd9f19ee2e78e57e3dd38 --- dh.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dh.c b/dh.c index 16eb13276..faa19a166 100644 --- a/dh.c +++ b/dh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh.c,v 1.64 2018/06/06 18:29:18 markus Exp $ */ +/* $OpenBSD: dh.c,v 1.65 2018/06/26 11:23:59 millert Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * @@ -190,7 +190,6 @@ choose_dh(int min, int wantbits, int max) linenum = 0; which = arc4random_uniform(bestcount); while (getline(&line, &linesize, f) != -1) { - linenum++; if (!parse_prime(linenum, line, &dhg)) continue; if ((dhg.size > max || dhg.size < min) ||