svn commit: rev 57036 - incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/messages/value

[erodriguez]

Author: erodriguez
Date: Tue Nov  9 05:14:07 2004
New Revision: 57036

Modified:
   
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/messages/value/PreAuthenticationData.java
   
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/messages/value/PreAuthenticationDataModifier.java
Log:
Changed pre-authentication data value from EncryptedData to byte[] since it can 
arrive in a number of types such as AP_REQ.

Modified: 
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/messages/value/PreAuthenticationData.java
==============================================================================
--- 
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/messages/value/PreAuthenticationData.java
  (original)
+++ 
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/messages/value/PreAuthenticationData.java
  Tue Nov  9 05:14:07 2004
@@ -16,22 +16,25 @@
  */
 package org.apache.kerberos.messages.value;
 
-public class PreAuthenticationData {
-
-       private PreAuthenticationDataType _dataType;
-       private EncryptedData             _dataValue = new EncryptedData();
+public class PreAuthenticationData
+{
+       private PreAuthenticationDataType dataType;
+       private byte[]                    dataValue;
        
-       public PreAuthenticationData(PreAuthenticationDataType dataType, 
EncryptedData encData) {
-               _dataType  = dataType;
-               _dataValue = encData;
+       public PreAuthenticationData(PreAuthenticationDataType dataType, byte[] 
dataValue)
+    {
+               this.dataType  = dataType;
+               this.dataValue = dataValue;
        }
        
-       public PreAuthenticationDataType getDataType() {
-               return _dataType;
+       public PreAuthenticationDataType getDataType()
+    {
+               return dataType;
        }
        
-       public byte[] getDataValue() {
-               return _dataValue.getCipherText();
+       public byte[] getDataValue()
+    {
+               return dataValue;
        }
 }
 

Modified: 
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/messages/value/PreAuthenticationDataModifier.java
==============================================================================
--- 
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/messages/value/PreAuthenticationDataModifier.java
  (original)
+++ 
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/messages/value/PreAuthenticationDataModifier.java
  Tue Nov  9 05:14:07 2004
@@ -16,21 +16,24 @@
  */
 package org.apache.kerberos.messages.value;
 
-public class PreAuthenticationDataModifier {
+public class PreAuthenticationDataModifier
+{
+       private PreAuthenticationDataType dataType;
+       private byte[]                    dataValue;
        
-       private PreAuthenticationDataType _dataType;
-       private EncryptedData             _dataValue = new EncryptedData();
-       
-       public PreAuthenticationData getPreAuthenticationData() {
-               return new PreAuthenticationData(_dataType, _dataValue);
+       public PreAuthenticationData getPreAuthenticationData()
+    {
+               return new PreAuthenticationData(dataType, dataValue);
        }
        
-       public void setDataType(PreAuthenticationDataType type) {
-               _dataType = type;
+       public void setDataType(PreAuthenticationDataType dataType)
+    {
+               this.dataType = dataType;
        }
        
-       public void setDataValue(byte[] value) {
-               _dataValue.setCipherText(value);
+       public void setDataValue(byte[] dataValue)
+    {
+               this.dataValue = dataValue;
        }
 }