diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-05-01 01:10:43 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-05-01 01:37:40 +0200 |
| commit | 56912dea6ef63dae4eb1194e5d88973a7c6c5740 (patch) | |
| tree | c0425585449d257a90a42efce5f602f7ce16779f /ssh-add.c | |
| parent | upstream commit (diff) | |
| download | openssh-56912dea6ef63dae4eb1194e5d88973a7c6c5740.tar.xz openssh-56912dea6ef63dae4eb1194e5d88973a7c6c5740.zip | |
upstream commit
unifdef WITH_SSH1 ok markus@
Upstream-ID: 9716e62a883ef8826c57f4d33b4a81a9cc7755c7
Diffstat (limited to 'ssh-add.c')
| -rw-r--r-- | ssh-add.c | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-add.c,v 1.128 2016/02/15 09:47:49 dtucker Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.129 2017/04/30 23:10:43 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -79,9 +79,6 @@ static char *default_files[] = { #endif #endif /* WITH_OPENSSL */ _PATH_SSH_CLIENT_ID_ED25519, -#ifdef WITH_SSH1 - _PATH_SSH_CLIENT_IDENTITY, -#endif NULL }; @@ -363,11 +360,7 @@ list_identities(int agent_fd, int do_fp) int r, had_identities = 0; struct ssh_identitylist *idlist; size_t i; -#ifdef WITH_SSH1 - int version = 1; -#else int version = 2; -#endif for (; version <= 2; version++) { if ((r = ssh_fetch_identitylist(agent_fd, version, |