diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-03-31 07:24:06 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-04-01 14:57:14 +0200 |
| commit | fdfbf4580de09d84a974211715e14f88a5704b8e (patch) | |
| tree | 37111a431abb3fa50fc2b5af83e2b34fb18a3e94 /pathnames.h | |
| parent | upstream commit (diff) | |
| download | openssh-fdfbf4580de09d84a974211715e14f88a5704b8e.tar.xz openssh-fdfbf4580de09d84a974211715e14f88a5704b8e.zip | |
upstream commit
Remove fallback from moduli to "primes" file that was
deprecated in 2001 and fix log messages referring to primes file. Based on
patch from xnox at ubuntu.com via bz#2559. "kill it" deraadt@
Upstream-ID: 0d4f8c70e2fa7431a83b95f8ca81033147ba8713
Diffstat (limited to 'pathnames.h')
| -rw-r--r-- | pathnames.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pathnames.h b/pathnames.h index ec89fc666..f5e11ab15 100644 --- a/pathnames.h +++ b/pathnames.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pathnames.h,v 1.24 2013/12/06 13:39:49 markus Exp $ */ +/* $OpenBSD: pathnames.h,v 1.25 2016/03/31 05:24:06 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -42,8 +42,6 @@ #define _PATH_HOST_ED25519_KEY_FILE SSHDIR "/ssh_host_ed25519_key" #define _PATH_HOST_RSA_KEY_FILE SSHDIR "/ssh_host_rsa_key" #define _PATH_DH_MODULI SSHDIR "/moduli" -/* Backwards compatibility */ -#define _PATH_DH_PRIMES SSHDIR "/primes" #ifndef _PATH_SSH_PROGRAM #define _PATH_SSH_PROGRAM "/usr/bin/ssh" |