summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-04-30 23:18:44 +0000
committerDamien Miller <djm@mindrot.org>2017-05-01 10:05:01 +1000
commit873d3e7d9a4707d0934fb4c4299354418f91b541 (patch)
tree4fd961131c84ad1626f11ffdcdc4316a26febacb /ssh.c
parent788ac799a6efa40517f2ac0d895a610394298ffc (diff)
upstream commit
remove KEY_RSA1 ok markus@ Upstream-ID: 7408517b077c892a86b581e19f82a163069bf133
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ssh.c b/ssh.c
index c1316f44c..ea394b0c2 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.456 2017/04/30 23:15:04 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.457 2017/04/30 23:18:44 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1276,8 +1276,7 @@ main(int ac, char **av)
1276 sensitive_data.nkeys = 0; 1276 sensitive_data.nkeys = 0;
1277 sensitive_data.keys = NULL; 1277 sensitive_data.keys = NULL;
1278 sensitive_data.external_keysign = 0; 1278 sensitive_data.external_keysign = 0;
1279 if (options.rhosts_rsa_authentication || 1279 if (options.hostbased_authentication) {
1280 options.hostbased_authentication) {
1281 sensitive_data.nkeys = 9; 1280 sensitive_data.nkeys = 9;
1282 sensitive_data.keys = xcalloc(sensitive_data.nkeys, 1281 sensitive_data.keys = xcalloc(sensitive_data.nkeys,
1283 sizeof(Key)); 1282 sizeof(Key));