diff options
| author |   djm <djm@openbsd.org> | 2015-12-11 03:20:09 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-12-11 03:20:09 +0000 |
| commit | e29975c9950c527808b45f58ed22eba119735214 (patch) | |
| tree | 0f0c91bbacc16cf1e79b37dba02b2a8f482b44f9 /usr.bin/ssh/ssh.c | |
| parent | use SSH_MAX_PUBKEY_BYTES consistently as buffer size when reading key (diff) | |
| download | wireguard-openbsd-e29975c9950c527808b45f58ed22eba119735214.tar.xz wireguard-openbsd-e29975c9950c527808b45f58ed22eba119735214.zip | |
don't try to load SSHv1 private key when compiled without SSHv1
support. From Iain Morgan bz#2505
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index eceb325b468..d424e8feed4 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -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 @@ -1208,8 +1208,10 @@ main(int ac, char **av) sizeof(Key)); PRIV_START; +#if WITH_SSH1 sensitive_data.keys[0] = key_load_private_type(KEY_RSA1, _PATH_HOST_KEY_FILE, "", NULL, NULL); +#endif sensitive_data.keys[1] = key_load_private_cert(KEY_ECDSA, _PATH_HOST_ECDSA_KEY_FILE, "", NULL); sensitive_data.keys[2] = key_load_private_cert(KEY_ED25519, |