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/25 08:46:48 UTC
svn commit: r541569 - in /directory/apacheds/trunk:
kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/
kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/
kerberos-shared/src/mai...
Author: erodriguez
Date: Thu May 24 23:46:46 2007
New Revision: 541569
URL: http://svn.apache.org/viewvc?view=rev&rev=541569
Log:
Minor warnings clean-up.
Modified:
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NullEncryption.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/Encodable.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetAllPrincipals.java
directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java
directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java
directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamSubsystem.java
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NullEncryption.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NullEncryption.java?view=diff&rev=541569&r1=541568&r2=541569
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NullEncryption.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NullEncryption.java Thu May 24 23:46:46 2007
@@ -63,24 +63,18 @@
public byte[] encrypt( byte[] plainText, byte[] keyBytes )
{
- return processCipher( true, plainText, keyBytes );
+ return plainText;
}
public byte[] decrypt( byte[] cipherText, byte[] keyBytes )
{
- return processCipher( false, cipherText, keyBytes );
+ return cipherText;
}
public byte[] calculateIntegrity( byte[] plainText, byte[] key, KeyUsage usage )
{
return null;
- }
-
-
- private byte[] processCipher( boolean encrypt, byte[] data, byte[] key )
- {
- return data;
}
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/Encodable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/Encodable.java?view=diff&rev=541569&r1=541568&r2=541569
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/Encodable.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/Encodable.java Thu May 24 23:46:46 2007
@@ -29,4 +29,5 @@
*/
public interface Encodable
{
+ // Marker interface; no methods to implement.
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetAllPrincipals.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetAllPrincipals.java?view=diff&rev=541569&r1=541568&r2=541569
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetAllPrincipals.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetAllPrincipals.java Thu May 24 23:46:46 2007
@@ -84,7 +84,7 @@
PrincipalStoreEntry[] entries = new PrincipalStoreEntry[answers.size()];
- return ( PrincipalStoreEntry[] ) answers.toArray( entries );
+ return answers.toArray( entries );
}
catch ( NamingException e )
{
Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java?view=diff&rev=541569&r1=541568&r2=541569
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java (original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java Thu May 24 23:46:46 2007
@@ -27,7 +27,6 @@
import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
import org.apache.directory.server.protocol.shared.ServiceConfiguration;
-import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
/**
@@ -383,6 +382,6 @@
}
}
- encryptionTypes = ( EncryptionType[] ) encTypes.toArray( new EncryptionType[encTypes.size()] );
+ encryptionTypes = encTypes.toArray( new EncryptionType[encTypes.size()] );
}
}
Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java?view=diff&rev=541569&r1=541568&r2=541569
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java (original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java Thu May 24 23:46:46 2007
@@ -278,7 +278,7 @@
minimizer.add( till );
minimizer.add( new KerberosTime( now.getTime() + config.getMaximumTicketLifetime() ) );
minimizer.add( tgt.getEndTime() );
- KerberosTime minTime = ( KerberosTime ) Collections.min( minimizer );
+ KerberosTime minTime = Collections.min( minimizer );
newTicketBody.setEndTime( minTime );
if ( request.getOption( KdcOptions.RENEWABLE_OK ) && minTime.lessThan( request.getTill() )
Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamSubsystem.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamSubsystem.java?view=diff&rev=541569&r1=541568&r2=541569
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamSubsystem.java (original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamSubsystem.java Thu May 24 23:46:46 2007
@@ -111,7 +111,7 @@
if ( verifiers.containsKey( entry.getSamType() ) )
{
- verifier = ( SamVerifier ) verifiers.get( entry.getSamType() );
+ verifier = verifiers.get( entry.getSamType() );
return verifier.verify( entry.getPrincipal(), sad );
}