2006-07-18 Casey Marshall <csm@gnu.org>ssl-nio-branch

	* gnu/javax/net/ssl/provider/ClientHandshake.java
	(implHandleInput, implHandleOutput): fix PSK exchange handling.
	(ClientDHGen.full): new field.
	(ClientDHGen.implRun): run full key exchange if `full' is true.
	(ClientDHGen.serverKey): new method.
	(RSAGen.full): new field.
	(RSAGen.implRun): run full key exchange if `full' is true.
	* gnu/javax/net/ssl/provider/ClientDHE_PSKParameters.java
	(params): slice the buffer.
	* gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java
	(<init>): use `dhParams,' not `buffer.'
	(params): slice the buffer.
	* gnu/javax/net/ssl/provider/ServerKeyExchange.java (length):
	handle case where parameters or signature are null.
	* gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java
	(version): removed.
	(<init>): don't take version argument.
	(<init>): don't take version argument; take buffer argument.
	(secret): pass TLS_1 to EncryptedPreMasterSecret constructor.
	* gnu/javax/net/ssl/provider/CipherSuite.java (isResolved): new
	field.
	(<init>, <init>): set `isResolved.'
	(resolve): add PSK cipher suite detection.
	(isResolved): new method.
	* gnu/javax/net/ssl/provider/ServerHandshake.java (serverKey): new
	field.
	(chooseSuites): choose NONE key exchanges, too; omit unresolved
	cipher suites.
	(implHandleInput, implHandleOutput): fix PSK handling.
	(checkKeyExchange): update for NONE and PSK exchanges.
	(CertLoader.implRun): grab our private key here.
	(RSAKeyExchange.implRun): initialize RSA cipher with our private
	key.
	(RSA_PSKExchange.implRun): likewise.
	* gnu/javax/net/ssl/provider/ExchangeKeys.java (<init>): duplicate
	and order the buffer; handle null argument.
	* gnu/javax/net/ssl/provider/ClientKeyExchange.java
	(exchangeKeys): handle NONE exchange.
	* gnu/javax/net/ssl/provider/SSLContextImpl.java (engineInit):
	handle PSK key managers properly.
	* gnu/javax/net/ssl/provider/SSLEngineImpl.java (<init>): remove
	debug logging.
	* gnu/javax/net/ssl/provider/ServerDHParams.java (<init>):
	duplicate and order the buffer.
	* gnu/javax/crypto/RSACipherImpl.java (doFinal): allow short
	input.
	(rsaDecrypt): ensure there's a leading zero.
	* gnu/javax/net/ssl/provider/EmptyExchangeKeys.java: new file.

1 files changed, 8 insertions, 3 deletions

diff --git a/gnu/javax/crypto/RSACipherImpl.java b/gnu/javax/crypto/RSACipherImpl.java
index 05f77213e..c6235c928 100644
--- a/gnu/javax/crypto/RSACipherImpl.java
+++ b/gnu/javax/crypto/RSACipherImpl.java
@@ -204,8 +204,6 @@ public class RSACipherImpl extends CipherSpi
     engineUpdate (in, offset, length);
     if (opmode == Cipher.DECRYPT_MODE)
       {
-        if (pos < dataBuffer.length)
-          throw new IllegalBlockSizeException ("expecting exactly " + dataBuffer.length + " bytes");
         BigInteger enc = new BigInteger (1, dataBuffer);
         byte[] dec = rsaDecrypt (enc);
         logger.log (Component.CRYPTO, "RSA: decryption produced\n{0}",
@@ -292,6 +290,13 @@ public class RSACipherImpl extends CipherSpi
         dec = dec.multiply (r.modInverse (n)).mod (n);
       }
 
-    return dec.toByteArray ();
+    byte[] decb = dec.toByteArray();
+    if (decb[0] != 0x00)
+      {
+        byte[] b = new byte[decb.length + 1];
+        System.arraycopy(decb, 0, b, 1, decb.length);
+        decb = b;
+      }
+    return decb;
   }
 }