tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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@
This commit is contained in:
Damien Miller 2013-02-12 11:03:36 +11:00
parent fd05154dc4
commit 78d22713c7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -39,6 +39,11 @@
- markus@cvs.openbsd.org 2013/02/10 21:19:34 - markus@cvs.openbsd.org 2013/02/10 21:19:34
[version.h] [version.h]
openssh 6.2 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 20130211
- (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old

4
ssh-keygen.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2508,7 +2508,7 @@ main(int argc, char **argv)
if (do_screen_candidates) { if (do_screen_candidates) {
FILE *in; FILE *in;
FILE *out = fopen(out_file, "w"); FILE *out = fopen(out_file, "a");
if (have_identity && strcmp(identity_file, "-") != 0) { if (have_identity && strcmp(identity_file, "-") != 0) {
if ((in = fopen(identity_file, "r")) == NULL) { if ((in = fopen(identity_file, "r")) == NULL) {