2006-04-29 Raif S. Naffah <raif@swiftdsl.com.au>

	* gnu/java/security/provider/Gnu.java (run):
	Add "RSA" as an alias to MD5withRSA.
	* gnu/java/security/key/rsa/RSAKeyPairX509Codec.java (encodePublicKey):
	Always encode a NULL as the value of an algorithm parameters field.
	* gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java (log): New field.
	(encodePrivateKey): Added trace/log statements.
	(decodePrivateKey): Likewise.
	* gnu/java/security/key/rsa/RSAKeyPairGenerator.java (log): New field.
	(setup): Added trace/log statements.
	(generate): Likewise.
	* gnu/java/security/key/rsa/GnuRSAPublicKey.java (str): New field.
	(toString): New method.
	* gnu/java/security/key/rsa/GnuRSAPrivateKey.java (DEBUG): New constant.
	(str): New field.
	(toString): New method.
	* gnu/java/security/key/rsa/GnuRSAKey.java (str): New field.
	(getEncoded): Use defaultFormat.
	(toString): New method.
	* gnu/java/security/key/dss/DSSKey.java (toString):
	Include defaultFormat in string.
	* gnu/java/security/jce/sig/RSAKeyFactory.java (engineGeneratePublic):
	Break if successfully decoded public key.
	(engineGeneratePrivate): Break if successfully decoded private key.

1 files changed, 12 insertions, 2 deletions

diff --git a/gnu/java/security/key/rsa/RSAKeyPairGenerator.java b/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
index 9c7338f66..39063381f 100644
--- a/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
+++ b/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
@@ -50,6 +50,7 @@ import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.spec.RSAKeyGenParameterSpec;
 import java.util.Map;
+import java.util.logging.Logger;
 
 /**
  * <p>A key-pair generator for asymetric keys to use in conjunction with the RSA
@@ -68,10 +69,11 @@ import java.util.Map;
  */
 public class RSAKeyPairGenerator implements IKeyPairGenerator
 {
-
   // Constants and variables
   // -------------------------------------------------------------------------
 
+  private static final Logger log = Logger.getLogger(RSAKeyPairGenerator.class.getName());
+
   /** The BigInteger constant 1. */
   private static final BigInteger ONE = BigInteger.ONE;
 
@@ -150,6 +152,8 @@ public class RSAKeyPairGenerator implements IKeyPairGenerator
    */
   public void setup(Map attributes)
   {
+    log.entering(this.getClass().getName(), "setup", attributes);
+
     // do we have a SecureRandom, or should we use our own?
     rnd = (SecureRandom) attributes.get(SOURCE_OF_RANDOMNESS);
 
@@ -177,6 +181,8 @@ public class RSAKeyPairGenerator implements IKeyPairGenerator
     Integer formatID = (Integer) attributes.get(PREFERRED_ENCODING_FORMAT);
     preferredFormat = formatID == null ? DEFAULT_ENCODING_FORMAT
                                        : formatID.intValue();
+
+    log.exiting(this.getClass().getName(), "setup");
   }
 
   /**
@@ -187,6 +193,8 @@ public class RSAKeyPairGenerator implements IKeyPairGenerator
    */
   public KeyPair generate()
   {
+    log.entering(this.getClass().getName(), "generate");
+
     BigInteger p, q, n, d;
 
     // 1. Generate a prime p in the interval [2**(M-1), 2**M - 1], where
@@ -234,7 +242,9 @@ public class RSAKeyPairGenerator implements IKeyPairGenerator
     PublicKey pubK = new GnuRSAPublicKey(preferredFormat, n, e);
     PrivateKey secK = new GnuRSAPrivateKey(preferredFormat, p, q, e, d);
 
-    return new KeyPair(pubK, secK);
+    KeyPair result = new KeyPair(pubK, secK);
+    log.exiting(this.getClass().getName(), "generate", result);
+    return result;
   }
 
   // helper methods ----------------------------------------------------------