Fix typo and access to VMSecureRandom.

2009-02-03  Andrew John Hughes  <ahughes@redhat.com>

	PR classpath/38417:
	* gnu/java/security/jce/prng/SecureRandomAdapter.java:
	Remove unneeded import.
	* gnu/javax/crypto/jce/prng/FortunaImpl.java:
	Fix typo.
	* java/security/SecureRandom.java:
	Remove duplicate use of VMSecureRandom,
	call SecureRandomAdapter instead.
	* vm/reference/gnu/java/security/jce/prng/VMSecureRandom.java:
	Moved from java/security so SecureRandomAdapter can
	access it.

2 files changed, 2 insertions, 3 deletions

diff --git a/gnu/java/security/jce/prng/SecureRandomAdapter.java b/gnu/java/security/jce/prng/SecureRandomAdapter.java
index a17c6eb1b..5877e3edb 100644
--- a/gnu/java/security/jce/prng/SecureRandomAdapter.java
+++ b/gnu/java/security/jce/prng/SecureRandomAdapter.java
@@ -45,7 +45,6 @@ import gnu.java.security.prng.MDGenerator;
 
 import java.security.AccessController;
 import java.security.SecureRandom;
-import java.security.VMSecureRandom;
 import java.security.SecureRandomSpi;
 
 import java.util.Collections;
@@ -101,7 +100,7 @@ public abstract class SecureRandomAdapter
   }
 
   public static final byte[] getSeed(int numBytes)
-  {
+  {  
     URL sourceUrl = null;
     String urlStr = null;
 
diff --git a/gnu/javax/crypto/jce/prng/FortunaImpl.java b/gnu/javax/crypto/jce/prng/FortunaImpl.java
index add5b9ee0..b18410c09 100644
--- a/gnu/javax/crypto/jce/prng/FortunaImpl.java
+++ b/gnu/javax/crypto/jce/prng/FortunaImpl.java
@@ -93,7 +93,7 @@ public final class FortunaImpl
       }
   }
 
-  protected byte[] engineGenerateSeed(int numbytes)
+  protected byte[] engineGenerateSeed(int numBytes)
   {
     return SecureRandomAdapter.getSeed(numBytes);
   }