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 2004/08/04 10:37:52 

[dh.c]
     return group14 when no primes found - fixes hang on empty /etc/moduli;
     ok markus@
This commit is contained in:
Darren Tucker 2004-08-12 22:40:59 +10:00
parent 5cb30ad2ec
commit 9a2bd1116b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -8,6 +8,10 @@
[auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c [auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c
sshconnect1.c] sshconnect1.c]
more s/illegal/invalid/ more s/illegal/invalid/
- djm@cvs.openbsd.org 2004/08/04 10:37:52
[dh.c]
return group14 when no primes found - fixes hang on empty /etc/moduli;
ok markus@
20040720 20040720
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -1575,4 +1579,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3491 2004/08/12 12:40:24 dtucker Exp $ $Id: ChangeLog,v 1.3492 2004/08/12 12:40:59 dtucker Exp $

4
dh.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: dh.c,v 1.30 2004/06/13 12:53:24 djm Exp $"); RCSID("$OpenBSD: dh.c,v 1.31 2004/08/04 10:37:52 djm Exp $");
#include "xmalloc.h" #include "xmalloc.h"
@ -145,7 +145,7 @@ choose_dh(int min, int wantbits, int max)
if (bestcount == 0) { if (bestcount == 0) {
fclose(f); fclose(f);
logit("WARNING: no suitable primes in %s", _PATH_DH_PRIMES); logit("WARNING: no suitable primes in %s", _PATH_DH_PRIMES);
return (NULL); return (dh_new_group14());
} }
linenum = 0; linenum = 0;