upstream commit

update to new API (key_fingerprint => sshkey_fingerprint)
 check sshkey_fingerprint return values; ok markus

1 files changed, 3 insertions, 2 deletions

diff --git a/ssh-agent.c b/ssh-agent.c
index ba8d020ad..41e12acc9 100644
--- a/ssh-agent.c
+++ b/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
@@ -212,7 +212,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);