- djm@cvs.openbsd.org 2013/02/10 23:32:10

     [ssh-keygen.c]
     append to moduli file when screening candidates rather than overwriting.
     allows resumption of interrupted screen; patch from Christophe Garault
     in bz#1957; ok dtucker@

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 07384320a..1b803f7dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,11 @@
    - markus@cvs.openbsd.org 2013/02/10 21:19:34
      [version.h]
      openssh 6.2
+   - djm@cvs.openbsd.org 2013/02/10 23:32:10
+     [ssh-keygen.c]
+     append to moduli file when screening candidates rather than overwriting.
+     allows resumption of interrupted screen; patch from Christophe Garault
+     in bz#1957; ok dtucker@
 
 20130211
  - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 21c7f25ea..d1a205e18 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.224 2013/01/18 07:59:46 jmc Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.225 2013/02/10 23:32:10 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2508,7 +2508,7 @@ main(int argc, char **argv)
 
         if (do_screen_candidates) {
                 FILE *in;
-                FILE *out = fopen(out_file, "w");
+                FILE *out = fopen(out_file, "a");
 
                 if (have_identity && strcmp(identity_file, "-") != 0) {
                         if ((in = fopen(identity_file, "r")) == NULL) {