1 files changed, 30 insertions, 8 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/Random.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/Random.java
index d006dcdfc..f1d0ecd45 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/Random.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/Random.java
@@ -24,9 +24,16 @@
 
 package at.gv.egovernment.moa.id.util;
 
+
+import iaik.security.random.SeedGenerator;
+
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.security.SecureRandom;
 
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.Base64Utils;
+
 /**
  * Random number generator used to generate ID's
  * @author Paul Ivancsics
@@ -35,21 +42,36 @@ import java.security.SecureRandom;
 public class Random {
 
   /** random number generator used */
-	private static SecureRandom random = new SecureRandom();
+	//private static SecureRandom random = new SecureRandom();
+	private static SecureRandom random;
+	private static SeedGenerator seedgenerator;
+	
+	static {
+		random = iaik.security.random.SHA256FIPS186Random.getDefault();
+	    seedgenerator = iaik.security.random.AutoSeedGenerator.getDefault();
+
+		
+	}
   /**
    * Creates a new random number, to be used as an ID.
    * 
    * @return random long as a String
    */
   public static String nextRandom() {
-
-	  byte[] b = new byte[16]; // 16 bytes = 128 bits
-	  random.nextBytes(b);
-		 
 	  
-	  ByteBuffer bb = ByteBuffer.wrap(b);
-	  long l = bb.getLong();
+	byte[] b = new byte[32]; // 32 bytes = 256 bits
+	random.nextBytes(b);
+		 
+    ByteBuffer bb = ByteBuffer.wrap(b);
+	long l = bb.getLong();
+	return "" + l;
+		
+
+  }
+  
+  public static void seedRandom() {
 	  
-	  return "" + l;
+	  if (seedgenerator.seedAvailable())
+		  random.setSeed(seedgenerator.getSeed());
   }
 }