diff options
author | Colin Watson <cjwatson@debian.org> | 2015-08-22 10:05:45 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-08-22 10:05:45 +0100 |
commit | 58ddb8ad21f21f5358db0204c4ba9abf94a1ca11 (patch) | |
tree | c55df1f23e6fa0fb87a96d8ec4c06a68c3a82b45 /ssh-add.c | |
parent | 544df7a04ae5b5c1fc30be7c445ad685d7a02dc9 (diff) | |
parent | 1dc8d93ce69d6565747eb44446ed117187621b26 (diff) |
Import openssh_7.0p1.orig.tar.gz
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; |