From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0
---
src/main/java/com/gitblit/transport/ssh/CachingPublicKeyAuthenticator.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/CachingPublicKeyAuthenticator.java b/src/main/java/com/gitblit/transport/ssh/CachingPublicKeyAuthenticator.java
index 4ce26d0..e804a0d 100644
--- a/src/main/java/com/gitblit/transport/ssh/CachingPublicKeyAuthenticator.java
+++ b/src/main/java/com/gitblit/transport/ssh/CachingPublicKeyAuthenticator.java
@@ -34,8 +34,7 @@
import com.google.common.base.Preconditions;
/**
- *
- * @author Eric Myrhe
+ * Authenticates an SSH session against a public key.
*
*/
public class CachingPublicKeyAuthenticator implements PublickeyAuthenticator, SessionListener {
@@ -84,7 +83,7 @@
for (SshKey key : keys) {
log.debug("auth compare to {}", key.getFingerprint());
- if (key.equals(suppliedKey)) {
+ if (key.getPublicKey().equals(suppliedKey)) {
UserModel user = authManager.authenticate(username, key);
if (user != null) {
client.setUser(user);
--
Gitblit v1.9.1