diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-12-11 04:20:09 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-12-18 04:50:09 +0100 |
| commit | 6091c362e89079397e68744ae30df121b0a72c07 (patch) | |
| tree | 2797ec278ed6bf16fe28b94bf3410e3734ab745a /ssh.c | |
| parent | upstream commit (diff) | |
| download | openssh-6091c362e89079397e68744ae30df121b0a72c07.tar.xz openssh-6091c362e89079397e68744ae30df121b0a72c07.zip | |
upstream commit
don't try to load SSHv1 private key when compiled without
SSHv1 support. From Iain Morgan bz#2505
Upstream-ID: 8b8e7b02a448cf5e5635979df2d83028f58868a7
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.431 2015/12/10 17:08:40 mmcc Exp $ */ +/* $OpenBSD: ssh.c,v 1.432 2015/12/11 03:20:09 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1243,8 +1243,10 @@ main(int ac, char **av) sensitive_data.keys[i] = NULL; PRIV_START; +#if WITH_SSH1 sensitive_data.keys[0] = key_load_private_type(KEY_RSA1, _PATH_HOST_KEY_FILE, "", NULL, NULL); +#endif #ifdef OPENSSL_HAS_ECC sensitive_data.keys[1] = key_load_private_cert(KEY_ECDSA, _PATH_HOST_ECDSA_KEY_FILE, "", NULL); |