diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-07-03 03:43:18 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-07-15 15:35:09 +1000 |
commit | c28fc62d789d860c75e23a9fa9fb250eb2beca57 (patch) | |
tree | 9b540db8aed167256bb61cd9df90dbedb31cc79d /ssh-add.c | |
parent | 564d63e1b4a9637a209d42a9d49646781fc9caef (diff) |
upstream commit
delete support for legacy v00 certificates; "sure"
markus@ dtucker@
Upstream-ID: b5b9bb5f9202d09e88f912989d74928601b6636f
Diffstat (limited to 'ssh-add.c')
-rw-r--r-- | ssh-add.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-add.c,v 1.122 2015/03/26 12:32:38 naddy Exp $ */ | 1 | /* $OpenBSD: ssh-add.c,v 1.123 2015/07/03 03:43:18 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 |
@@ -302,8 +302,7 @@ add_file(int agent_fd, const char *filename, int key_only) | |||
302 | } | 302 | } |
303 | 303 | ||
304 | /* Graft with private bits */ | 304 | /* Graft with private bits */ |
305 | if ((r = sshkey_to_certified(private, | 305 | if ((r = sshkey_to_certified(private)) != 0) { |
306 | sshkey_cert_is_legacy(cert))) != 0) { | ||
307 | error("%s: sshkey_to_certified: %s", __func__, ssh_err(r)); | 306 | error("%s: sshkey_to_certified: %s", __func__, ssh_err(r)); |
308 | sshkey_free(cert); | 307 | sshkey_free(cert); |
309 | goto out; | 308 | goto out; |