From 7fdb35be120e74cc8f40b9bf7fad41370b5bbdbf Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Fri, 28 Dec 2012 17:53:06 +0100
Subject: [299275] Flexible Approach for an Authentication Mechanism
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=299275

---
 .../server/internal/net4j/protocol/CDOServerProtocol.java  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java')

diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java
index dcc2ffd447..b2414e325f 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
 import org.eclipse.emf.cdo.server.IRepositoryProvider;
 import org.eclipse.emf.cdo.server.internal.net4j.bundle.OM;
 import org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage;
-import org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult;
 import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch;
 import org.eclipse.emf.cdo.spi.server.ISessionProtocol;
 import org.eclipse.emf.cdo.spi.server.InternalSession;
@@ -32,6 +31,8 @@ import org.eclipse.net4j.signal.SignalReactor;
 import org.eclipse.net4j.util.io.StringCompressor;
 import org.eclipse.net4j.util.io.StringIO;
 import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
+import org.eclipse.net4j.util.security.DiffieHellman.Client.Response;
+import org.eclipse.net4j.util.security.DiffieHellman.Server.Challenge;
 
 /**
  * @author Eike Stepper
@@ -83,9 +84,16 @@ public class CDOServerProtocol extends SignalProtocol<InternalSession> implement
     this.negotiationTimeout = negotiationTimeout;
   }
 
-  public CDOAuthenticationResult sendAuthenticationChallenge(byte[] randomToken) throws Exception
+  @Deprecated
+  public org.eclipse.emf.cdo.spi.common.CDOAuthenticationResult sendAuthenticationChallenge(byte[] randomToken)
+      throws Exception
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  public Response sendAuthenticationChallenge(Challenge challenge) throws Exception
   {
-    return new AuthenticationRequest(this, randomToken).send(negotiationTimeout);
+    return new AuthenticationRequest(this, challenge).send(negotiationTimeout);
   }
 
   public void sendRepositoryTypeNotification(CDOCommonRepository.Type oldType, CDOCommonRepository.Type newType)
-- 
cgit v1.2.3