diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-01-28 22:36:00 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-29 10:18:56 +1100 |
commit | 9ce86c926dfa6e0635161b035e3944e611cbccf0 (patch) | |
tree | d946ba3df439153ece7857d742035a3d6adcbc98 /ssh-add.c | |
parent | 9125525c37bf73ad3ee4025520889d2ce9d10f29 (diff) |
upstream commit
update to new API (key_fingerprint => sshkey_fingerprint)
check sshkey_fingerprint return values; ok markus
Diffstat (limited to 'ssh-add.c')
-rw-r--r-- | ssh-add.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-add.c,v 1.117 2015/01/16 06:40:12 deraadt Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.118 2015/01/28 22:36:00 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -375,7 +375,8 @@ list_identities(int agent_fd, int do_fp) fp = sshkey_fingerprint(idlist->keys[i], fingerprint_hash, SSH_FP_DEFAULT); printf("%d %s %s (%s)\n", - sshkey_size(idlist->keys[i]), fp, + sshkey_size(idlist->keys[i]), + fp == NULL ? "(null)" : fp, idlist->comments[i], sshkey_type(idlist->keys[i])); free(fp); |