misc fixes

From-SVN: r45758

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fe52c144b515118f723924ea5978ac0ea800734b..506b21a7d60c5632d083fa8e70d09652eb725402 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,16 @@
+2001-09-22  Anthony Green  <green@redhat.com>
+
+       * java/security/DummyKeyPairGenerator.java (initialize): New
+       method (with AlgorithmParameterSpec argument).
+
+2001-09-22  Anthony Green  <green@redhat.com>
+
+       * java/security/spec/EncodedKeySpec.java: Implements KeySpec.
+
+       * gnu/java/security/provider/SHA1PRNG.java: Extend from
+       SecureRandomSpi.  
+       (engineNextBytes): Fix order of memory copies.
+       
 2001-09-21  Richard Henderson  <rth@redhat.com>
 
        * include/jvm.h (_Jv_VTable): Handle function descriptors for ia64;

diff --git a/libjava/gnu/java/security/provider/SHA1PRNG.java b/libjava/gnu/java/security/provider/SHA1PRNG.java
index 3aaf652bb46ba9e5b7ffbd67a5bab481d53cd616..bb34ef0f189f43181b4911d397e93665eef2d6e1 100644 (file)
--- a/libjava/gnu/java/security/provider/SHA1PRNG.java
+++ b/libjava/gnu/java/security/provider/SHA1PRNG.java
@@ -28,13 +28,12 @@ executable file might be covered by the GNU General Public License. */
 package gnu.java.security.provider;
 
 import java.util.Random;
-// import java.security.SecureRandomSpi;
+import java.security.SecureRandomSpi;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.io.Serializable;
 
-// public class SHA1PRNG extends SecureRandomSpi implements Serializable
-public class SHA1PRNG implements Serializable
+public class SHA1PRNG extends SecureRandomSpi implements Serializable
 {
   MessageDigest digest;
   byte seed[];
@@ -76,7 +75,7 @@ public class SHA1PRNG implements Serializable
   {
 
     if( bytes.length < (20 - datapos) ) {
-      System.arraycopy( bytes, 0, data, datapos, bytes.length);
+      System.arraycopy( data, datapos, bytes, 0, bytes.length);
       datapos += bytes.length;
       return;
     }
@@ -85,7 +84,7 @@ public class SHA1PRNG implements Serializable
     byte digestdata[];
     while( bpos < blen ) {
       i = 20 - datapos;
-      System.arraycopy( bytes, bpos, data, datapos, i);
+      System.arraycopy( data, datapos, bytes, bpos, i);
       bpos += i;
       datapos += i;
       if( datapos >= 20) {

diff --git a/libjava/java/security/DummyKeyPairGenerator.java b/libjava/java/security/DummyKeyPairGenerator.java
index 6b3f146f7e4d9791fb8f89dcb6d08b4a2b62d490..32605765416833a973267d17341a50555c8f6170 100644 (file)
--- a/libjava/java/security/DummyKeyPairGenerator.java
+++ b/libjava/java/security/DummyKeyPairGenerator.java
@@ -25,6 +25,7 @@ This exception does not however invalidate any other reasons why the
 executable file might be covered by the GNU General Public License. */
 
 package java.security;
+import java.security.spec.AlgorithmParameterSpec;
 
 final class DummyKeyPairGenerator extends KeyPairGenerator
 {
@@ -41,6 +42,12 @@ final class DummyKeyPairGenerator extends KeyPairGenerator
     kpgSpi.initialize(keysize, random);
   }
 
+  public void initialize(AlgorithmParameterSpec params, SecureRandom random)
+    throws InvalidAlgorithmParameterException
+  {
+    kpgSpi.initialize(params, random);
+  }
+
   public KeyPair generateKeyPair()
   {
     return kpgSpi.generateKeyPair();

diff --git a/libjava/java/security/spec/EncodedKeySpec.java b/libjava/java/security/spec/EncodedKeySpec.java
index d0a83f816af5ae05a57028e795dbf2dda30c05c1..2d6bd120caaa56004e813046cdef2f75cbc6be70 100644 (file)
--- a/libjava/java/security/spec/EncodedKeySpec.java
+++ b/libjava/java/security/spec/EncodedKeySpec.java
@@ -35,7 +35,7 @@ package java.security.spec;
 
        @author Mark Benvenuto
 */
-public abstract class EncodedKeySpec 
+public abstract class EncodedKeySpec implements KeySpec
 {
 
   private byte[] encodedKey;