[jboss-cvs] JBossAS SVN: r83668 - projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 30 05:59:34 EST 2009
Author: darran.lofthouse at jboss.com
Date: 2009-01-30 05:59:34 -0500 (Fri, 30 Jan 2009)
New Revision: 83668
Modified:
projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenDecoder.java
projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenInit.java
projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenInitDecoder.java
projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenTarg.java
projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenTargDecoder.java
projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/SPNEGOMessage.java
Log:
[SECURITY-271] Refactor MechTokenMIC decoding to common base.
Modified: projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenDecoder.java
===================================================================
--- projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenDecoder.java 2009-01-30 10:43:38 UTC (rev 83667)
+++ projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenDecoder.java 2009-01-30 10:59:34 UTC (rev 83668)
@@ -31,37 +31,47 @@
{
byte first = (byte) is.read();
byte masked = (byte) (first & (byte) 128);
-
+
if (masked == 0)
{
return first;
}
-
+
int lengthLength = first & (byte) 127;
-
+
byte[] lengthBytes = new byte[lengthLength];
is.read(lengthBytes);
-
+
int length = 0;
for (int i = 0; i < lengthLength; i++)
{
int currentPos = lengthLength - i - 1;
int currentLength = lengthBytes[currentPos];
-
+
if (currentLength < 0)
{
currentLength += 256;
}
-
+
if (i > 0)
{
currentLength = currentLength * (int) (Math.pow(2, 8 * i));
}
-
+
length += currentLength;
}
-
+
return length;
}
+ static void decodeMechListMIC(final InputStream is, final SPNEGOMessage spnegoMessage) throws IOException
+ {
+ int length = readLength(is);
+
+ byte[] mechListMIC = new byte[length];
+ is.read(mechListMIC);
+
+ spnegoMessage.setMechListMIC(mechListMIC);
+ }
+
}
Modified: projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenInit.java
===================================================================
--- projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenInit.java 2009-01-30 10:43:38 UTC (rev 83667)
+++ projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenInit.java 2009-01-30 10:59:34 UTC (rev 83668)
@@ -40,8 +40,6 @@
private byte[] mechToken;
- private byte[] mechListMIC;
-
public Oid getMessageOid()
{
return messageOid;
@@ -83,16 +81,6 @@
this.mechToken = mechToken;
}
- public byte[] getMechListMIC()
- {
- return mechListMIC;
- }
-
- public void setMechListMIC(byte[] mechListMIC)
- {
- this.mechListMIC = mechListMIC;
- }
-
@Override
public void writeTo(OutputStream os) throws IOException
{
Modified: projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenInitDecoder.java
===================================================================
--- projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenInitDecoder.java 2009-01-30 10:43:38 UTC (rev 83667)
+++ projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenInitDecoder.java 2009-01-30 10:59:34 UTC (rev 83668)
@@ -72,15 +72,6 @@
negTokenInit.setMechToken(mechToken);
}
- protected static void decodeMechListMIC(final InputStream is, final NegTokenInit negTokenInit) throws IOException
- {
- int length = NegTokenDecoder.readLength(is);
- byte[] mechListMIC = new byte[length];
- is.read(mechListMIC);
-
- negTokenInit.setMechListMIC(mechListMIC);
- }
-
protected static void decodeNegTokenInitSequence(final InputStream is, final NegTokenInit negTokenInit)
throws IOException, GSSException
{
Modified: projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenTarg.java
===================================================================
--- projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenTarg.java 2009-01-30 10:43:38 UTC (rev 83667)
+++ projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenTarg.java 2009-01-30 10:59:34 UTC (rev 83668)
@@ -39,10 +39,8 @@
private Oid supportedMech = null;
- private byte[] responseToken = null;
+ private byte[] responseToken = null;
- private byte[] mechListMIC = null;
-
public Integer getNegResult()
{
return negResult;
@@ -73,16 +71,6 @@
this.responseToken = responseToken;
}
- public byte[] getMechListMIC()
- {
- return mechListMIC;
- }
-
- public void setMechListMIC(byte[] mechListMIC)
- {
- this.mechListMIC = mechListMIC;
- }
-
@Override
public void writeTo(final OutputStream os) throws IOException
{
Modified: projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenTargDecoder.java
===================================================================
--- projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenTargDecoder.java 2009-01-30 10:43:38 UTC (rev 83667)
+++ projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/NegTokenTargDecoder.java 2009-01-30 10:59:34 UTC (rev 83668)
@@ -80,16 +80,6 @@
negTokenTarg.setResponseToken(responseToken);
}
- private static void decodeMechListMIC(final InputStream is, final NegTokenTarg negTokenTarg) throws IOException
- {
- int length = readLength(is);
-
- byte[] mechListMIC = new byte[length];
- is.read(mechListMIC);
-
- negTokenTarg.setMechListMIC(mechListMIC);
- }
-
private static void decodeNegTokenTargSequence(final InputStream is, final NegTokenTarg negTokenTarg)
throws IOException, GSSException
{
Modified: projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/SPNEGOMessage.java
===================================================================
--- projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/SPNEGOMessage.java 2009-01-30 10:43:38 UTC (rev 83667)
+++ projects/security/security-negotiation/branches/Branch_2_0/jboss-negotiation-spnego/src/main/java/org/jboss/security/negotiation/spnego/encoding/SPNEGOMessage.java 2009-01-30 10:59:34 UTC (rev 83668)
@@ -28,10 +28,22 @@
public abstract class SPNEGOMessage extends NegotiationMessage
{
+ private byte[] mechListMIC = null;
+
@Override
public String getMessageType()
{
return "SPNEGO";
}
+ public byte[] getMechListMIC()
+ {
+ return mechListMIC;
+ }
+
+ public void setMechListMIC(byte[] mechListMIC)
+ {
+ this.mechListMIC = mechListMIC;
+ }
+
}
More information about the jboss-cvs-commits
mailing list