[jboss-cvs] JBossAS SVN: r63076 - in trunk/varia/src/main/org/jboss/security/srp: jaas and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 15 23:32:17 EDT 2007
Author: anil.saldhana at jboss.com
Date: 2007-05-15 23:32:17 -0400 (Tue, 15 May 2007)
New Revision: 63076
Modified:
trunk/varia/src/main/org/jboss/security/srp/SRPClientSession.java
trunk/varia/src/main/org/jboss/security/srp/SRPConf.java
trunk/varia/src/main/org/jboss/security/srp/SRPParameters.java
trunk/varia/src/main/org/jboss/security/srp/SRPRemoteServer.java
trunk/varia/src/main/org/jboss/security/srp/SRPServerSession.java
trunk/varia/src/main/org/jboss/security/srp/SerialObjectStore.java
trunk/varia/src/main/org/jboss/security/srp/jaas/SRPLoginModule.java
Log:
move Util to CryptoUtil/SecurityUtil
Modified: trunk/varia/src/main/org/jboss/security/srp/SRPClientSession.java
===================================================================
--- trunk/varia/src/main/org/jboss/security/srp/SRPClientSession.java 2007-05-16 03:31:51 UTC (rev 63075)
+++ trunk/varia/src/main/org/jboss/security/srp/SRPClientSession.java 2007-05-16 03:32:17 UTC (rev 63076)
@@ -26,8 +26,8 @@
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
-import org.jboss.logging.Logger;
-import org.jboss.security.Util;
+import org.jboss.crypto.CryptoUtil;
+import org.jboss.logging.Logger;
/** The client side logic to the SRP protocol. The class is intended to be used
* with a SRPServerSession object via the SRPServerInterface. The SRP algorithm
@@ -98,7 +98,7 @@
try
{
// Initialize the secure random number and message digests
- Util.init();
+ CryptoUtil.init();
}
catch(NoSuchAlgorithmException e)
{
@@ -115,49 +115,49 @@
}
if( log.isTraceEnabled() )
- log.trace("g: "+Util.tob64(params.g));
+ log.trace("g: "+CryptoUtil.tob64(params.g));
// Calculate x = H(s | H(U | ':' | password))
- byte[] xb = Util.calculatePasswordHash(username, password, params.s);
+ byte[] xb = CryptoUtil.calculatePasswordHash(username, password, params.s);
if( log.isTraceEnabled() )
- log.trace("x: "+Util.tob64(xb));
+ log.trace("x: "+CryptoUtil.tob64(xb));
this.x = new BigInteger(1, xb);
this.v = g.modPow(x, N); // g^x % N
if( log.isTraceEnabled() )
- log.trace("v: "+Util.tob64(v.toByteArray()));
+ log.trace("v: "+CryptoUtil.tob64(v.toByteArray()));
- serverHash = Util.newDigest();
- clientHash = Util.newDigest();
+ serverHash = CryptoUtil.newDigest();
+ clientHash = CryptoUtil.newDigest();
// H(N)
- byte[] hn = Util.newDigest().digest(params.N);
+ byte[] hn = CryptoUtil.newDigest().digest(params.N);
if( log.isTraceEnabled() )
- log.trace("H(N): "+Util.tob64(hn));
+ log.trace("H(N): "+CryptoUtil.tob64(hn));
// H(g)
- byte[] hg = Util.newDigest().digest(params.g);
+ byte[] hg = CryptoUtil.newDigest().digest(params.g);
if( log.isTraceEnabled() )
- log.trace("H(g): "+Util.tob64(hg));
+ log.trace("H(g): "+CryptoUtil.tob64(hg));
// clientHash = H(N) xor H(g)
- byte[] hxg = Util.xor(hn, hg, 20);
+ byte[] hxg = CryptoUtil.xor(hn, hg, 20);
if( log.isTraceEnabled() )
- log.trace("H(N) xor H(g): "+Util.tob64(hxg));
+ log.trace("H(N) xor H(g): "+CryptoUtil.tob64(hxg));
clientHash.update(hxg);
if( log.isTraceEnabled() )
{
- MessageDigest tmp = Util.copy(clientHash);
- log.trace("H[H(N) xor H(g)]: "+Util.tob64(tmp.digest()));
+ MessageDigest tmp = CryptoUtil.copy(clientHash);
+ log.trace("H[H(N) xor H(g)]: "+CryptoUtil.tob64(tmp.digest()));
}
// clientHash = H(N) xor H(g) | H(U)
- clientHash.update(Util.newDigest().digest(username.getBytes()));
+ clientHash.update(CryptoUtil.newDigest().digest(username.getBytes()));
if( log.isTraceEnabled() )
{
- MessageDigest tmp = Util.copy(clientHash);
- log.trace("H[H(N) xor H(g) | H(U)]: "+Util.tob64(tmp.digest()));
+ MessageDigest tmp = CryptoUtil.copy(clientHash);
+ log.trace("H[H(N) xor H(g) | H(U)]: "+CryptoUtil.tob64(tmp.digest()));
}
// clientHash = H(N) xor H(g) | H(U) | s
clientHash.update(params.s);
if( log.isTraceEnabled() )
{
- MessageDigest tmp = Util.copy(clientHash);
- log.trace("H[H(N) xor H(g) | H(U) | s]: "+Util.tob64(tmp.digest()));
+ MessageDigest tmp = CryptoUtil.copy(clientHash);
+ log.trace("H[H(N) xor H(g) | H(U) | s]: "+CryptoUtil.tob64(tmp.digest()));
}
K = null;
}
@@ -177,17 +177,17 @@
BigInteger one = BigInteger.ONE;
do
{
- a = new BigInteger(A_LEN, Util.getPRNG());
+ a = new BigInteger(A_LEN, CryptoUtil.getPRNG());
} while(a.compareTo(one) <= 0);
}
A = g.modPow(a, N);
- Abytes = Util.trim(A.toByteArray());
+ Abytes = CryptoUtil.trim(A.toByteArray());
// clientHash = H(N) xor H(g) | H(U) | A
clientHash.update(Abytes);
if( log.isTraceEnabled() )
{
- MessageDigest tmp = Util.copy(clientHash);
- log.trace("H[H(N) xor H(g) | H(U) | s | A]: "+Util.tob64(tmp.digest()));
+ MessageDigest tmp = CryptoUtil.copy(clientHash);
+ log.trace("H[H(N) xor H(g) | H(U) | s | A]: "+CryptoUtil.tob64(tmp.digest()));
}
// serverHash = A
serverHash.update(Abytes);
@@ -206,51 +206,51 @@
clientHash.update(Bbytes);
if( log.isTraceEnabled() )
{
- MessageDigest tmp = Util.copy(clientHash);
- log.trace("H[H(N) xor H(g) | H(U) | s | A | B]: "+Util.tob64(tmp.digest()));
+ MessageDigest tmp = CryptoUtil.copy(clientHash);
+ log.trace("H[H(N) xor H(g) | H(U) | s | A | B]: "+CryptoUtil.tob64(tmp.digest()));
}
// Calculate u as the first 32 bits of H(B)
- byte[] hB = Util.newDigest().digest(Bbytes);
+ byte[] hB = CryptoUtil.newDigest().digest(Bbytes);
byte[] ub =
{hB[0], hB[1], hB[2], hB[3]};
// Calculate S = (B - g^x) ^ (a + u * x) % N
BigInteger B = new BigInteger(1, Bbytes);
if( log.isTraceEnabled() )
- log.trace("B: "+Util.tob64(B.toByteArray()));
+ log.trace("B: "+CryptoUtil.tob64(B.toByteArray()));
if( B.compareTo(v) < 0 )
B = B.add(N);
if( log.isTraceEnabled() )
- log.trace("B': "+Util.tob64(B.toByteArray()));
+ log.trace("B': "+CryptoUtil.tob64(B.toByteArray()));
if( log.isTraceEnabled() )
- log.trace("v: "+Util.tob64(v.toByteArray()));
+ log.trace("v: "+CryptoUtil.tob64(v.toByteArray()));
BigInteger u = new BigInteger(1, ub);
if( log.isTraceEnabled() )
- log.trace("u: "+Util.tob64(u.toByteArray()));
+ log.trace("u: "+CryptoUtil.tob64(u.toByteArray()));
BigInteger B_v = B.subtract(v);
if( log.isTraceEnabled() )
- log.trace("B - v: "+Util.tob64(B_v.toByteArray()));
+ log.trace("B - v: "+CryptoUtil.tob64(B_v.toByteArray()));
BigInteger a_ux = a.add(u.multiply(x));
if( log.isTraceEnabled() )
- log.trace("a + u * x: "+Util.tob64(a_ux.toByteArray()));
+ log.trace("a + u * x: "+CryptoUtil.tob64(a_ux.toByteArray()));
BigInteger S = B_v.modPow(a_ux, N);
if( log.isTraceEnabled() )
- log.trace("S: "+Util.tob64(S.toByteArray()));
+ log.trace("S: "+CryptoUtil.tob64(S.toByteArray()));
// K = SessionHash(S)
MessageDigest sessionDigest = MessageDigest.getInstance(params.hashAlgorithm);
K = sessionDigest.digest(S.toByteArray());
if( log.isTraceEnabled() )
- log.trace("K: "+Util.tob64(K));
+ log.trace("K: "+CryptoUtil.tob64(K));
// clientHash = H(N) xor H(g) | H(U) | A | B | K
clientHash.update(K);
byte[] M1 = clientHash.digest();
if( log.isTraceEnabled() )
- log.trace("M1: H[H(N) xor H(g) | H(U) | s | A | B | K]: "+Util.tob64(M1));
+ log.trace("M1: H[H(N) xor H(g) | H(U) | s | A | B | K]: "+CryptoUtil.tob64(M1));
serverHash.update(M1);
serverHash.update(K);
if( log.isTraceEnabled() )
{
- MessageDigest tmp = Util.copy(serverHash);
- log.trace("H[A | M1 | K]: "+Util.tob64(tmp.digest()));
+ MessageDigest tmp = CryptoUtil.copy(serverHash);
+ log.trace("H[A | M1 | K]: "+CryptoUtil.tob64(tmp.digest()));
}
return M1;
}
@@ -265,8 +265,8 @@
boolean valid = Arrays.equals(M2, myM2);
if( log.isTraceEnabled() )
{
- log.trace("verify serverM2: "+Util.tob64(M2));
- log.trace("verify M2: "+Util.tob64(myM2));
+ log.trace("verify serverM2: "+CryptoUtil.tob64(M2));
+ log.trace("verify M2: "+CryptoUtil.tob64(myM2));
}
return valid;
}
Modified: trunk/varia/src/main/org/jboss/security/srp/SRPConf.java
===================================================================
--- trunk/varia/src/main/org/jboss/security/srp/SRPConf.java 2007-05-16 03:31:51 UTC (rev 63075)
+++ trunk/varia/src/main/org/jboss/security/srp/SRPConf.java 2007-05-16 03:32:17 UTC (rev 63076)
@@ -23,7 +23,7 @@
import java.math.BigInteger;
-import org.jboss.security.Util;
+import org.jboss.crypto.CryptoUtil;
/** A port of the libsrp/t_conf.c predefined constants for the N & g parameters
of the SRP algorithm. It contains a collection of "good" primes for N and the
@@ -53,22 +53,22 @@
}
public byte[] Nbytes()
{
- return Util.fromb64(modb64);
+ return CryptoUtil.fromb64(modb64);
}
public byte[] gbytes()
{
- return Util.fromb64(genb64);
+ return CryptoUtil.fromb64(genb64);
}
public BigInteger N()
{
if( N == null )
- N = new BigInteger(1, Util.fromb64(modb64));
+ N = new BigInteger(1, CryptoUtil.fromb64(modb64));
return N;
}
public BigInteger g()
{
if( g == null )
- g = new BigInteger(1, Util.fromb64(genb64));
+ g = new BigInteger(1, CryptoUtil.fromb64(genb64));
return g;
}
public String getComment()
Modified: trunk/varia/src/main/org/jboss/security/srp/SRPParameters.java
===================================================================
--- trunk/varia/src/main/org/jboss/security/srp/SRPParameters.java 2007-05-16 03:31:51 UTC (rev 63075)
+++ trunk/varia/src/main/org/jboss/security/srp/SRPParameters.java 2007-05-16 03:32:17 UTC (rev 63076)
@@ -24,7 +24,7 @@
import java.io.Serializable;
import java.util.Arrays;
-import org.jboss.security.Util;
+import org.jboss.crypto.CryptoUtil;
/** The RFC2945 algorithm session parameters that the client and server
agree to use. In addition to the base RFC2945 parameters, one can choose an
@@ -133,11 +133,11 @@
StringBuffer tmp = new StringBuffer(super.toString());
tmp.append('{');
tmp.append("N: ");
- tmp.append(Util.encodeBase64(N));
+ tmp.append(CryptoUtil.encodeBase64(N));
tmp.append("|g: ");
- tmp.append(Util.encodeBase64(g));
+ tmp.append(CryptoUtil.encodeBase64(g));
tmp.append("|s: ");
- tmp.append(Util.encodeBase64(s));
+ tmp.append(CryptoUtil.encodeBase64(s));
tmp.append("|hashAlgorithm: ");
tmp.append(hashAlgorithm);
tmp.append("|cipherAlgorithm: ");
Modified: trunk/varia/src/main/org/jboss/security/srp/SRPRemoteServer.java
===================================================================
--- trunk/varia/src/main/org/jboss/security/srp/SRPRemoteServer.java 2007-05-16 03:31:51 UTC (rev 63075)
+++ trunk/varia/src/main/org/jboss/security/srp/SRPRemoteServer.java 2007-05-16 03:32:17 UTC (rev 63076)
@@ -35,7 +35,7 @@
import javax.crypto.SealedObject;
import org.jboss.logging.Logger;
-import org.jboss.security.Util;
+import org.jboss.crypto.CryptoUtil;
import org.jboss.security.srp.SRPVerifierStore.VerifierInfo;
/** An implementation of the RMI SRPRemoteServerInterface interface.
@@ -132,10 +132,10 @@
if (log.isTraceEnabled())
{
log.trace("Params: " + params);
- byte[] hn = Util.newDigest().digest(params.N);
- log.trace("H(N): " + Util.tob64(hn));
- byte[] hg = Util.newDigest().digest(params.g);
- log.trace("H(g): " + Util.tob64(hg));
+ byte[] hn = CryptoUtil.newDigest().digest(params.N);
+ log.trace("H(N): " + CryptoUtil.tob64(hn));
+ byte[] hg = CryptoUtil.newDigest().digest(params.g);
+ log.trace("H(g): " + CryptoUtil.tob64(hg));
}
}
catch (IOException e)
@@ -248,8 +248,8 @@
try
{
byte[] skey = session.getSessionKey();
- Object tmpKey = Util.createSecretKey(params.cipherAlgorithm, skey);
- challenge = Util.accessSealedObject(params.cipherAlgorithm, tmpKey,
+ Object tmpKey = CryptoUtil.createSecretKey(params.cipherAlgorithm, skey);
+ challenge = CryptoUtil.accessSealedObject(params.cipherAlgorithm, tmpKey,
params.cipherIV, auxChallenge);
}
catch (GeneralSecurityException e)
Modified: trunk/varia/src/main/org/jboss/security/srp/SRPServerSession.java
===================================================================
--- trunk/varia/src/main/org/jboss/security/srp/SRPServerSession.java 2007-05-16 03:31:51 UTC (rev 63075)
+++ trunk/varia/src/main/org/jboss/security/srp/SRPServerSession.java 2007-05-16 03:32:17 UTC (rev 63076)
@@ -28,7 +28,7 @@
import java.util.Arrays;
import org.jboss.logging.Logger;
-import org.jboss.security.Util;
+import org.jboss.crypto.CryptoUtil;
/** The server side logic to the SRP protocol. The class is the server side
equivalent of the SRPClientSession object. An implementation of
@@ -93,42 +93,42 @@
this.g = new BigInteger(1, params.g);
this.N = new BigInteger(1, params.N);
if( log.isTraceEnabled() )
- log.trace("g: "+Util.tob64(params.g));
+ log.trace("g: "+CryptoUtil.tob64(params.g));
if( log.isTraceEnabled() )
- log.trace("v: "+Util.tob64(vb));
- serverHash = Util.newDigest();
- clientHash = Util.newDigest();
+ log.trace("v: "+CryptoUtil.tob64(vb));
+ serverHash = CryptoUtil.newDigest();
+ clientHash = CryptoUtil.newDigest();
// H(N)
- byte[] hn = Util.newDigest().digest(params.N);
+ byte[] hn = CryptoUtil.newDigest().digest(params.N);
if( log.isTraceEnabled() )
- log.trace("H(N): "+Util.tob64(hn));
+ log.trace("H(N): "+CryptoUtil.tob64(hn));
// H(g)
- byte[] hg = Util.newDigest().digest(params.g);
+ byte[] hg = CryptoUtil.newDigest().digest(params.g);
if( log.isTraceEnabled() )
- log.trace("H(g): "+Util.tob64(hg));
+ log.trace("H(g): "+CryptoUtil.tob64(hg));
// clientHash = H(N) xor H(g)
- byte[] hxg = Util.xor(hn, hg, 20);
+ byte[] hxg = CryptoUtil.xor(hn, hg, 20);
if( log.isTraceEnabled() )
- log.trace("H(N) xor H(g): "+Util.tob64(hxg));
+ log.trace("H(N) xor H(g): "+CryptoUtil.tob64(hxg));
clientHash.update(hxg);
if( log.isTraceEnabled() )
{
- MessageDigest tmp = Util.copy(clientHash);
- log.trace("H[H(N) xor H(g)]: "+Util.tob64(tmp.digest()));
+ MessageDigest tmp = CryptoUtil.copy(clientHash);
+ log.trace("H[H(N) xor H(g)]: "+CryptoUtil.tob64(tmp.digest()));
}
// clientHash = H(N) xor H(g) | H(U)
- clientHash.update(Util.newDigest().digest(username.getBytes()));
+ clientHash.update(CryptoUtil.newDigest().digest(username.getBytes()));
if( log.isTraceEnabled() )
{
- MessageDigest tmp = Util.copy(clientHash);
- log.trace("H[H(N) xor H(g) | H(U)]: "+Util.tob64(tmp.digest()));
+ MessageDigest tmp = CryptoUtil.copy(clientHash);
+ log.trace("H[H(N) xor H(g) | H(U)]: "+CryptoUtil.tob64(tmp.digest()));
}
// clientHash = H(N) xor H(g) | H(U) | s
clientHash.update(params.s);
if( log.isTraceEnabled() )
{
- MessageDigest tmp = Util.copy(clientHash);
- log.trace("H[H(N) xor H(g) | H(U) | s]: "+Util.tob64(tmp.digest()));
+ MessageDigest tmp = CryptoUtil.copy(clientHash);
+ log.trace("H[H(N) xor H(g) | H(U) | s]: "+CryptoUtil.tob64(tmp.digest()));
}
K = null;
}
@@ -152,13 +152,13 @@
BigInteger one = BigInteger.valueOf(1);
do
{
- b = new BigInteger(B_LEN, Util.getPRNG());
+ b = new BigInteger(B_LEN, CryptoUtil.getPRNG());
} while(b.compareTo(one) <= 0);
B = v.add(g.modPow(b, N));
if(B.compareTo(N) >= 0)
B = B.subtract(N);
}
- return Util.trim(B.toByteArray());
+ return CryptoUtil.trim(B.toByteArray());
}
/**
@@ -170,56 +170,56 @@
public void buildSessionKey(byte[] ab) throws NoSuchAlgorithmException
{
if( log.isTraceEnabled() )
- log.trace("A: "+Util.tob64(ab));
- byte[] nb = Util.trim(B.toByteArray());
+ log.trace("A: "+CryptoUtil.tob64(ab));
+ byte[] nb = CryptoUtil.trim(B.toByteArray());
// clientHash = H(N) xor H(g) | H(U) | s | A
clientHash.update(ab);
if( log.isTraceEnabled() )
{
- MessageDigest tmp = Util.copy(clientHash);
- log.trace("H[H(N) xor H(g) | H(U) | s | A]: "+Util.tob64(tmp.digest()));
+ MessageDigest tmp = CryptoUtil.copy(clientHash);
+ log.trace("H[H(N) xor H(g) | H(U) | s | A]: "+CryptoUtil.tob64(tmp.digest()));
}
// clientHash = H(N) xor H(g) | H(U) | A | B
clientHash.update(nb);
if( log.isTraceEnabled() )
{
- MessageDigest tmp = Util.copy(clientHash);
- log.trace("H[H(N) xor H(g) | H(U) | s | A | B]: "+Util.tob64(tmp.digest()));
+ MessageDigest tmp = CryptoUtil.copy(clientHash);
+ log.trace("H[H(N) xor H(g) | H(U) | s | A | B]: "+CryptoUtil.tob64(tmp.digest()));
}
// serverHash = A
serverHash.update(ab);
// Calculate u as the first 32 bits of H(B)
- byte[] hB = Util.newDigest().digest(nb);
+ byte[] hB = CryptoUtil.newDigest().digest(nb);
byte[] ub =
{hB[0], hB[1], hB[2], hB[3]};
// Calculate S = (A * v^u) ^ b % N
BigInteger A = new BigInteger(1, ab);
if( log.isTraceEnabled() )
- log.trace("A: "+Util.tob64(A.toByteArray()));
+ log.trace("A: "+CryptoUtil.tob64(A.toByteArray()));
if( log.isTraceEnabled() )
- log.trace("B: "+Util.tob64(B.toByteArray()));
+ log.trace("B: "+CryptoUtil.tob64(B.toByteArray()));
if( log.isTraceEnabled() )
- log.trace("v: "+Util.tob64(v.toByteArray()));
+ log.trace("v: "+CryptoUtil.tob64(v.toByteArray()));
BigInteger u = new BigInteger(1, ub);
if( log.isTraceEnabled() )
- log.trace("u: "+Util.tob64(u.toByteArray()));
+ log.trace("u: "+CryptoUtil.tob64(u.toByteArray()));
BigInteger A_v2u = A.multiply(v.modPow(u, N)).mod(N);
if( log.isTraceEnabled() )
- log.trace("A * v^u: "+Util.tob64(A_v2u.toByteArray()));
+ log.trace("A * v^u: "+CryptoUtil.tob64(A_v2u.toByteArray()));
BigInteger S = A_v2u.modPow(b, N);
if( log.isTraceEnabled() )
- log.trace("S: "+Util.tob64(S.toByteArray()));
+ log.trace("S: "+CryptoUtil.tob64(S.toByteArray()));
// K = SessionHash(S)
MessageDigest sessionDigest = MessageDigest.getInstance(params.hashAlgorithm);
K = sessionDigest.digest(S.toByteArray());
if( log.isTraceEnabled() )
- log.trace("K: "+Util.tob64(K));
+ log.trace("K: "+CryptoUtil.tob64(K));
// clientHash = H(N) xor H(g) | H(U) | A | B | K
clientHash.update(K);
if( log.isTraceEnabled() )
{
- MessageDigest tmp = Util.copy(clientHash);
- log.trace("H[H(N) xor H(g) | H(U) | s | A | B | K]: "+Util.tob64(tmp.digest()));
+ MessageDigest tmp = CryptoUtil.copy(clientHash);
+ log.trace("H[H(N) xor H(g) | H(U) | s | A | B | K]: "+CryptoUtil.tob64(tmp.digest()));
}
}
@@ -264,8 +264,8 @@
M1 = clientHash.digest();
if( log.isTraceEnabled() )
{
- log.trace("verify M1: "+Util.tob64(M1));
- log.trace("verify clientM1: "+Util.tob64(clientM1));
+ log.trace("verify M1: "+CryptoUtil.tob64(M1));
+ log.trace("verify clientM1: "+CryptoUtil.tob64(clientM1));
}
if( Arrays.equals(clientM1, M1) )
{
@@ -275,8 +275,8 @@
serverHash.update(K);
if( log.isTraceEnabled() )
{
- MessageDigest tmp = Util.copy(serverHash);
- log.trace("H(A | M1 | K)"+Util.tob64(tmp.digest()));
+ MessageDigest tmp = CryptoUtil.copy(serverHash);
+ log.trace("H(A | M1 | K)"+CryptoUtil.tob64(tmp.digest()));
}
valid = true;
}
Modified: trunk/varia/src/main/org/jboss/security/srp/SerialObjectStore.java
===================================================================
--- trunk/varia/src/main/org/jboss/security/srp/SerialObjectStore.java 2007-05-16 03:31:51 UTC (rev 63075)
+++ trunk/varia/src/main/org/jboss/security/srp/SerialObjectStore.java 2007-05-16 03:32:17 UTC (rev 63076)
@@ -35,7 +35,7 @@
import java.util.Map;
import org.jboss.logging.Logger;
-import org.jboss.security.Util;
+import org.jboss.crypto.CryptoUtil;
import org.jboss.security.srp.SRPConf;
import org.jboss.security.srp.SRPVerifierStore;
import org.jboss.security.srp.SRPVerifierStore.VerifierInfo;
@@ -96,7 +96,7 @@
try
{
- Util.init();
+ CryptoUtil.init();
}
catch(NoSuchAlgorithmException e)
{
@@ -105,12 +105,12 @@
}
N = SRPConf.getDefaultParams().N();
g = SRPConf.getDefaultParams().g();
- log.trace("N: "+Util.tob64(N.toByteArray()));
- log.trace("g: "+Util.tob64(g.toByteArray()));
- byte[] hn = Util.newDigest().digest(N.toByteArray());
- log.trace("H(N): "+Util.tob64(hn));
- byte[] hg = Util.newDigest().digest(g.toByteArray());
- log.trace("H(g): "+Util.tob64(hg));
+ log.trace("N: "+CryptoUtil.tob64(N.toByteArray()));
+ log.trace("g: "+CryptoUtil.tob64(g.toByteArray()));
+ byte[] hn = CryptoUtil.newDigest().digest(N.toByteArray());
+ log.trace("H(N): "+CryptoUtil.tob64(hn));
+ byte[] hg = CryptoUtil.newDigest().digest(g.toByteArray());
+ log.trace("H(g): "+CryptoUtil.tob64(hg));
}
// --- Begin SRPVerifierStore interface methods
@@ -164,22 +164,22 @@
try
{
char[] pass = password.toCharArray();
- info.verifier = Util.calculateVerifier(username, pass,
+ info.verifier = CryptoUtil.calculateVerifier(username, pass,
info.salt, N, g);
info.g = g.toByteArray();
info.N = N.toByteArray();
if( log.isTraceEnabled() )
{
- log.trace("N: "+Util.tob64(info.N));
- log.trace("g: "+Util.tob64(info.g));
- log.trace("s: "+Util.tob64(info.salt));
- byte[] xb = Util.calculatePasswordHash(username, pass, info.salt);
- log.trace("x: "+Util.tob64(xb));
- log.trace("v: "+Util.tob64(info.verifier));
- byte[] hn = Util.newDigest().digest(info.N);
- log.trace("H(N): "+Util.tob64(hn));
- byte[] hg = Util.newDigest().digest(info.g);
- log.trace("H(g): "+Util.tob64(hg));
+ log.trace("N: "+CryptoUtil.tob64(info.N));
+ log.trace("g: "+CryptoUtil.tob64(info.g));
+ log.trace("s: "+CryptoUtil.tob64(info.salt));
+ byte[] xb = CryptoUtil.calculatePasswordHash(username, pass, info.salt);
+ log.trace("x: "+CryptoUtil.tob64(xb));
+ log.trace("v: "+CryptoUtil.tob64(info.verifier));
+ byte[] hn = CryptoUtil.newDigest().digest(info.N);
+ log.trace("H(N): "+CryptoUtil.tob64(hn));
+ byte[] hg = CryptoUtil.newDigest().digest(info.g);
+ log.trace("H(g): "+CryptoUtil.tob64(hg));
}
}
catch(Throwable t)
Modified: trunk/varia/src/main/org/jboss/security/srp/jaas/SRPLoginModule.java
===================================================================
--- trunk/varia/src/main/org/jboss/security/srp/jaas/SRPLoginModule.java 2007-05-16 03:31:51 UTC (rev 63075)
+++ trunk/varia/src/main/org/jboss/security/srp/jaas/SRPLoginModule.java 2007-05-16 03:32:17 UTC (rev 63076)
@@ -39,8 +39,8 @@
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import org.jboss.logging.Logger;
-import org.jboss.security.Util;
+import org.jboss.crypto.CryptoUtil;
+import org.jboss.logging.Logger;
import org.jboss.security.auth.callback.ByteArrayCallback;
import org.jboss.security.srp.SRPClientSession;
import org.jboss.security.srp.SRPParameters;
@@ -191,7 +191,7 @@
{ // Perform the SRP login protocol
if( trace )
log.trace("Getting SRP parameters for username: "+username);
- Util.init();
+ CryptoUtil.init();
Object[] sessionInfo = srpServer.getSRPParameters(username, multipleSessions);
params = (SRPParameters) sessionInfo[0];
sessionID = (Integer) sessionInfo[1];
@@ -200,19 +200,19 @@
if( trace )
{
log.trace("SessionID: "+sessionID);
- log.trace("N: "+Util.tob64(params.N));
- log.trace("g: "+Util.tob64(params.g));
- log.trace("s: "+Util.tob64(params.s));
+ log.trace("N: "+CryptoUtil.tob64(params.N));
+ log.trace("g: "+CryptoUtil.tob64(params.g));
+ log.trace("s: "+CryptoUtil.tob64(params.s));
log.trace("cipherAlgorithm: "+params.cipherAlgorithm);
log.trace("hashAlgorithm: "+params.hashAlgorithm);
}
- byte[] hn = Util.newDigest().digest(params.N);
+ byte[] hn = CryptoUtil.newDigest().digest(params.N);
if( trace )
- log.trace("H(N): "+Util.tob64(hn));
- byte[] hg = Util.newDigest().digest(params.g);
+ log.trace("H(N): "+CryptoUtil.tob64(hn));
+ byte[] hg = CryptoUtil.newDigest().digest(params.g);
if( trace )
{
- log.trace("H(g): "+Util.tob64(hg));
+ log.trace("H(g): "+CryptoUtil.tob64(hg));
log.trace("Creating SRPClientSession");
}
@@ -434,8 +434,8 @@
try
{
Serializable data = (Serializable) challenge;
- Object tmpKey = Util.createSecretKey(cipherAlgorithm, key);
- sealedObject = Util.createSealedObject(cipherAlgorithm, tmpKey, cipherIV, data);
+ Object tmpKey = CryptoUtil.createSecretKey(cipherAlgorithm, key);
+ sealedObject = CryptoUtil.createSealedObject(cipherAlgorithm, tmpKey, cipherIV, data);
}
catch(Exception e)
{
@@ -454,7 +454,7 @@
Object secretKey = null;
try
{
- secretKey = Util.createSecretKey(cipherAlgorithm, key);
+ secretKey = CryptoUtil.createSecretKey(cipherAlgorithm, key);
}
catch(Exception e)
{
More information about the jboss-cvs-commits
mailing list