Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-p2p/azureus/files/patches-4.0.0.2: use-jdk-cipher-only.diff remove-osx-platform.diff
Date: Sun, 02 Nov 2008 20:19:12
Message-Id: E1KwjPg-0000Ii-PU@stork.gentoo.org
1 caster 08/11/02 20:19:08
2
3 Added: use-jdk-cipher-only.diff remove-osx-platform.diff
4 Log:
5 Version bump to 4.0.0.2, bug #242520. Uses EAPI=2 use deps for swt. Now uses shared plugin directory for upstream-bundled core plugins which fixes bug #219177 and #140372. Fixed also console UI and revbumped 3.1.1.0-r1 to include the fix as well for possibly sooner stable candidate - bug #219103. Cleanup old and unperspective versions.
6 (Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo-r1-perfctr x86_64)
7
8 Revision Changes Path
9 1.1 net-p2p/azureus/files/patches-4.0.0.2/use-jdk-cipher-only.diff
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-4.0.0.2/use-jdk-cipher-only.diff?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-4.0.0.2/use-jdk-cipher-only.diff?rev=1.1&content-type=text/plain
13
14 Index: use-jdk-cipher-only.diff
15 ===================================================================
16 --- com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java.orig 2008-07-06 22:54:36.000000000 +0200
17 +++ com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java 2008-07-06 22:56:29.000000000 +0200
18 @@ -36,7 +36,6 @@
19 import org.bouncycastle.crypto.encodings.PKCS1Encoding;
20 import org.bouncycastle.crypto.engines.RSAEngine;
21 import org.bouncycastle.crypto.params.ParametersWithRandom;
22 -import org.bouncycastle.jce.provider.RSAUtil;
23 import org.gudy.azureus2.core3.util.Debug;
24 import org.gudy.azureus2.plugins.utils.StaticUtilities;
25
26 @@ -82,30 +81,12 @@
27
28 byte[] secret_bytes = session_key.getEncoded();
29
30 - try{
31 Cipher rsa_cipher = Cipher.getInstance( "RSA" );
32
33 rsa_cipher.init( Cipher.ENCRYPT_MODE, public_key );
34
35 encryped_session_key = rsa_cipher.doFinal( secret_bytes );
36
37 - }catch( Throwable e ){
38 -
39 - // fallback to the BC implementation for jdk1.4.2 as JCE RSA not available
40 -
41 - RSAEngine eng = new RSAEngine();
42 -
43 - PKCS1Encoding padded_eng = new PKCS1Encoding( eng );
44 -
45 - CipherParameters param = RSAUtil.generatePublicKeyParameter(public_key);
46 -
47 - param = new ParametersWithRandom(param, new SecureRandom());
48 -
49 - padded_eng.init( true, param );
50 -
51 - encryped_session_key = padded_eng.processBlock(secret_bytes, 0, secret_bytes.length);
52 - }
53 -
54 }catch( Throwable e ){
55
56 e.printStackTrace();
57
58
59
60 1.1 net-p2p/azureus/files/patches-4.0.0.2/remove-osx-platform.diff
61
62 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-4.0.0.2/remove-osx-platform.diff?rev=1.1&view=markup
63 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-4.0.0.2/remove-osx-platform.diff?rev=1.1&content-type=text/plain
64
65 Index: remove-osx-platform.diff
66 ===================================================================
67 --- org/gudy/azureus2/platform/PlatformManagerFactory.java.orig 2008-07-06 22:58:18.000000000 +0200
68 +++ org/gudy/azureus2/platform/PlatformManagerFactory.java 2008-07-06 22:59:21.000000000 +0200
69 @@ -50,10 +50,6 @@
70
71 platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
72
73 - }else if( getPlatformType() == PlatformManager.PT_MACOSX ){
74 -
75 - platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
76 -
77 }else if( getPlatformType() == PlatformManager.PT_UNIX ){
78
79 platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton();
80 @@ -89,10 +85,6 @@
81
82 return (PlatformManager.PT_WINDOWS );
83
84 - } else if (Constants.isOSX) {
85 -
86 - return (PlatformManager.PT_MACOSX );
87 -
88 } else if (Constants.isUnix) {
89
90 return (PlatformManager.PT_UNIX );