You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2007/05/02 07:14:05 UTC
svn commit: r534313 - in
/directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc:
./ authentication/ ticketgrant/
Author: erodriguez
Date: Tue May 1 22:14:04 2007
New Revision: 534313
URL: http://svn.apache.org/viewvc?view=rev&rev=534313
Log:
Update in protocol-kerberos due to renaming of LockBox to CipherTextHandler.
Modified:
directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java
directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/ConfigureAuthenticationChain.java
directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java
Modified: directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java?view=diff&rev=534313&r1=534312&r2=534313
==============================================================================
--- directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java (original)
+++ directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java Tue May 1 22:14:04 2007
@@ -22,9 +22,9 @@
import java.net.InetAddress;
+import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
import org.apache.directory.server.kerberos.shared.messages.KerberosMessage;
-import org.apache.directory.server.kerberos.shared.service.LockBox;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
@@ -41,7 +41,7 @@
private KdcRequest request;
private KerberosMessage reply;
private InetAddress clientAddress;
- private LockBox lockBox;
+ private CipherTextHandler cipherTextHandler;
/**
@@ -135,19 +135,19 @@
/**
- * @return Returns the lockBox.
+ * @return Returns the {@link CipherTextHandler}.
*/
- public LockBox getLockBox()
+ public CipherTextHandler getCipherTextHandler()
{
- return lockBox;
+ return cipherTextHandler;
}
/**
- * @param lockBox The lockBox to set.
+ * @param cipherTextHandler The {@link CipherTextHandler} to set.
*/
- public void setLockBox( LockBox lockBox )
+ public void setCipherTextHandler( CipherTextHandler cipherTextHandler )
{
- this.lockBox = lockBox;
+ this.cipherTextHandler = cipherTextHandler;
}
}
Modified: directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/ConfigureAuthenticationChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/ConfigureAuthenticationChain.java?view=diff&rev=534313&r1=534312&r2=534313
==============================================================================
--- directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/ConfigureAuthenticationChain.java (original)
+++ directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/ConfigureAuthenticationChain.java Tue May 1 22:14:04 2007
@@ -20,14 +20,9 @@
package org.apache.directory.server.kerberos.kdc.authentication;
-import java.util.Map;
-
-import org.apache.directory.server.kerberos.shared.crypto.checksum.ChecksumType;
-import org.apache.directory.server.kerberos.shared.crypto.checksum.RsaMd5Checksum;
-import org.apache.directory.server.kerberos.shared.crypto.checksum.Sha1Checksum;
+import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.replay.InMemoryReplayCache;
import org.apache.directory.server.kerberos.shared.replay.ReplayCache;
-import org.apache.directory.server.kerberos.shared.service.LockBox;
import org.apache.mina.common.IoSession;
import org.apache.mina.handler.chain.IoHandlerCommand;
@@ -39,20 +34,17 @@
public class ConfigureAuthenticationChain implements IoHandlerCommand
{
private static final ReplayCache replayCache = new InMemoryReplayCache();
- private static final LockBox lockBox = new LockBox();
+ private static final CipherTextHandler cipherTextHandler = new CipherTextHandler();
private String contextKey = "context";
+
public void execute( NextCommand next, IoSession session, Object message ) throws Exception
{
AuthenticationContext authContext = ( AuthenticationContext ) session.getAttribute( getContextKey() );
authContext.setReplayCache( replayCache );
- authContext.setLockBox( lockBox );
-
- Map checksumEngines = authContext.getChecksumEngines();
- checksumEngines.put( ChecksumType.RSA_MD5, new RsaMd5Checksum() );
- checksumEngines.put( ChecksumType.SHA1, new Sha1Checksum() );
+ authContext.setCipherTextHandler( cipherTextHandler );
next.execute( session, message );
}
Modified: directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java?view=diff&rev=534313&r1=534312&r2=534313
==============================================================================
--- directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java (original)
+++ directory/apacheds/branches/kerberos-encryption-types/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java Tue May 1 22:14:04 2007
@@ -20,9 +20,9 @@
package org.apache.directory.server.kerberos.kdc.ticketgrant;
+import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.replay.InMemoryReplayCache;
import org.apache.directory.server.kerberos.shared.replay.ReplayCache;
-import org.apache.directory.server.kerberos.shared.service.LockBox;
import org.apache.mina.common.IoSession;
import org.apache.mina.handler.chain.IoHandlerCommand;
@@ -34,7 +34,7 @@
public class ConfigureTicketGrantingChain implements IoHandlerCommand
{
private static final ReplayCache replayCache = new InMemoryReplayCache();
- private static final LockBox lockBox = new LockBox();
+ private static final CipherTextHandler cipherTextHandler = new CipherTextHandler();
private String contextKey = "context";
@@ -43,7 +43,7 @@
TicketGrantingContext tgsContext = ( TicketGrantingContext ) session.getAttribute( getContextKey() );
tgsContext.setReplayCache( replayCache );
- tgsContext.setLockBox( lockBox );
+ tgsContext.setCipherTextHandler( cipherTextHandler );
next.execute( session, message );
}