[patch] files/patches-3.1.1.0/use-jdk-cipher-only.patch

use-jdk-cipher-only.patch (text/plain), 1.25 KB, created by Thomas Axelsson on 2008-08-07 17:09:02 UTC

--- work/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java.old	2008-08-07 18:09:55.000000000 +0200
+++ work/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java	2008-08-07 18:14:31.000000000 +0200
@@ -36,7 +36,7 @@
 import org.bouncycastle.crypto.encodings.PKCS1Encoding;
 import org.bouncycastle.crypto.engines.RSAEngine;
 import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.jce.provider.RSAUtil;
+//import org.bouncycastle.jce.provider.RSAUtil;
 import org.gudy.azureus2.core3.util.Debug;
 import org.gudy.azureus2.plugins.utils.StaticUtilities;
 
@@ -82,12 +82,15 @@
 				
 			byte[] secret_bytes = session_key.getEncoded();
 			
-			try{
+			//try{
 				Cipher	rsa_cipher = Cipher.getInstance( "RSA" );
 		    
 				rsa_cipher.init( Cipher.ENCRYPT_MODE, public_key );
 		    
 				encryped_session_key = rsa_cipher.doFinal( secret_bytes );
+
+			/* Gentoo: Depend on JDK >=1.5 so we don't need this code. This does not work
+			 * with our packaged bcprov
 				
 			}catch( Throwable e ){
 				
@@ -105,6 +108,7 @@
 				
 				encryped_session_key = padded_eng.processBlock(secret_bytes, 0, secret_bytes.length);
 			}
+			*/
 
 		}catch( Throwable e ){