diff options
author | Damien Miller <djm@mindrot.org> | 2013-02-12 11:03:36 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-02-12 11:03:36 +1100 |
commit | 78d22713c79da46b80eceec02411563be3c65e71 (patch) | |
tree | 92c7f1b081de7bbe465aadf132b52b5c4be23c64 | |
parent | fd05154dc45f6079618c6b0ce92cd6e9b55fc87f (diff) |
- 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@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -39,6 +39,11 @@ | |||
39 | - markus@cvs.openbsd.org 2013/02/10 21:19:34 | 39 | - markus@cvs.openbsd.org 2013/02/10 21:19:34 |
40 | [version.h] | 40 | [version.h] |
41 | openssh 6.2 | 41 | openssh 6.2 |
42 | - djm@cvs.openbsd.org 2013/02/10 23:32:10 | ||
43 | [ssh-keygen.c] | ||
44 | append to moduli file when screening candidates rather than overwriting. | ||
45 | allows resumption of interrupted screen; patch from Christophe Garault | ||
46 | in bz#1957; ok dtucker@ | ||
42 | 47 | ||
43 | 20130211 | 48 | 20130211 |
44 | - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old | 49 | - (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 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.224 2013/01/18 07:59:46 jmc Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.225 2013/02/10 23:32:10 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2508,7 +2508,7 @@ main(int argc, char **argv) | |||
2508 | 2508 | ||
2509 | if (do_screen_candidates) { | 2509 | if (do_screen_candidates) { |
2510 | FILE *in; | 2510 | FILE *in; |
2511 | FILE *out = fopen(out_file, "w"); | 2511 | FILE *out = fopen(out_file, "a"); |
2512 | 2512 | ||
2513 | if (have_identity && strcmp(identity_file, "-") != 0) { | 2513 | if (have_identity && strcmp(identity_file, "-") != 0) { |
2514 | if ((in = fopen(identity_file, "r")) == NULL) { | 2514 | if ((in = fopen(identity_file, "r")) == NULL) { |