diff options
| author |   djm <djm@openbsd.org> | 2015-01-28 22:36:00 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-01-28 22:36:00 +0000 |
| commit | 2b6695d0b425f1bd31a714c11bfcb8af1d37622e (patch) | |
| tree | 027add16a07c5ff46c52e2fb387caf555f7dfcb6 /usr.bin/ssh/ssh-agent.c | |
| parent | - Add PCH2 and PCH LPT to the list of chips capable of only 9K jumbos. (diff) | |
| download | wireguard-openbsd-2b6695d0b425f1bd31a714c11bfcb8af1d37622e.tar.xz wireguard-openbsd-2b6695d0b425f1bd31a714c11bfcb8af1d37622e.zip | |
update to new API (key_fingerprint => sshkey_fingerprint)
check sshkey_fingerprint return values;
ok markus
Diffstat (limited to 'usr.bin/ssh/ssh-agent.c')
| -rw-r--r-- | usr.bin/ssh/ssh-agent.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index e149098ad5d..11775dc5886 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.196 2015/01/16 06:40:12 deraadt Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.197 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 @@ -197,7 +197,8 @@ confirm_key(Identity *id) int ret = -1; p = sshkey_fingerprint(id->key, fingerprint_hash, SSH_FP_DEFAULT); - if (ask_permission("Allow use of key %s?\nKey fingerprint %s.", + if (p != NULL && + ask_permission("Allow use of key %s?\nKey fingerprint %s.", id->comment, p)) ret = 0; free(p); |