summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--auth2.c7
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e50b4859..fb0e58dde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@
21 - jakob@cvs.openbsd.org 2001/12/18 10:04:21 21 - jakob@cvs.openbsd.org 2001/12/18 10:04:21
22 [auth.h hostfile.c hostfile.h] 22 [auth.h hostfile.c hostfile.h]
23 remove auth_rsa_read_key, make hostfile_ready_key non static; ok markus@ 23 remove auth_rsa_read_key, make hostfile_ready_key non static; ok markus@
24 - jakob@cvs.openbsd.org 2001/12/18 10:05:15
25 [auth2.c]
26 log fingerprint on successful public key authentication; ok markus@
24 27
2520011219 2820011219
26 - (stevesk) OpenBSD CVS sync X11 localhost display 29 - (stevesk) OpenBSD CVS sync X11 localhost display
@@ -7049,4 +7052,4 @@
7049 - Wrote replacements for strlcpy and mkdtemp 7052 - Wrote replacements for strlcpy and mkdtemp
7050 - Released 1.0pre1 7053 - Released 1.0pre1
7051 7054
7052$Id: ChangeLog,v 1.1698 2001/12/21 01:47:09 djm Exp $ 7055$Id: ChangeLog,v 1.1699 2001/12/21 01:48:54 djm Exp $
diff --git a/auth2.c b/auth2.c
index 29bbdf4fb..7a52c3b43 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth2.c,v 1.75 2001/12/09 18:45:56 markus Exp $"); 26RCSID("$OpenBSD: auth2.c,v 1.76 2001/12/18 10:05:15 jakob Exp $");
27 27
28#include <openssl/evp.h> 28#include <openssl/evp.h>
29 29
@@ -651,6 +651,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
651 u_long linenum = 0; 651 u_long linenum = 0;
652 struct stat st; 652 struct stat st;
653 Key *found; 653 Key *found;
654 char *fp;
654 655
655 if (pw == NULL) 656 if (pw == NULL)
656 return 0; 657 return 0;
@@ -718,6 +719,10 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
718 found_key = 1; 719 found_key = 1;
719 debug("matching key found: file %s, line %lu", 720 debug("matching key found: file %s, line %lu",
720 file, linenum); 721 file, linenum);
722 fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
723 verbose("Found matching %s key: %s",
724 key_type(found), fp);
725 xfree(fp);
721 break; 726 break;
722 } 727 }
723 } 728 }