| 1 |
caster 09/03/27 22:02:15 |
| 2 |
|
| 3 |
Added: 0001-remove-osx-platform.patch |
| 4 |
0002-use-jdk-cipher-only.patch |
| 5 |
Log: |
| 6 |
Add missing patches |
| 7 |
(Portage version: 2.2_rc27/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-p2p/vuze/files/patches-4.2.0.0/0001-remove-osx-platform.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/files/patches-4.2.0.0/0001-remove-osx-platform.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/files/patches-4.2.0.0/0001-remove-osx-platform.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 0001-remove-osx-platform.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/org/gudy/azureus2/platform/PlatformManagerFactory.java b/org/gudy/azureus2/platform/PlatformManagerFactory.java |
| 18 |
index 156e5ac..b0fd283 100644 |
| 19 |
--- a/org/gudy/azureus2/platform/PlatformManagerFactory.java |
| 20 |
+++ b/org/gudy/azureus2/platform/PlatformManagerFactory.java |
| 21 |
@@ -50,10 +50,6 @@ PlatformManagerFactory |
| 22 |
|
| 23 |
platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton(); |
| 24 |
|
| 25 |
- }else if( getPlatformType() == PlatformManager.PT_MACOSX ){ |
| 26 |
- |
| 27 |
- platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton(); |
| 28 |
- |
| 29 |
}else if( getPlatformType() == PlatformManager.PT_UNIX ){ |
| 30 |
|
| 31 |
platform_manager = org.gudy.azureus2.platform.unix.PlatformManagerImpl.getSingleton(); |
| 32 |
@@ -89,10 +85,6 @@ PlatformManagerFactory |
| 33 |
|
| 34 |
return (PlatformManager.PT_WINDOWS ); |
| 35 |
|
| 36 |
- } else if (Constants.isOSX) { |
| 37 |
- |
| 38 |
- return (PlatformManager.PT_MACOSX ); |
| 39 |
- |
| 40 |
} else if (Constants.isUnix) { |
| 41 |
|
| 42 |
return (PlatformManager.PT_UNIX ); |
| 43 |
-- |
| 44 |
1.6.2 |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.1 net-p2p/vuze/files/patches-4.2.0.0/0002-use-jdk-cipher-only.patch |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/files/patches-4.2.0.0/0002-use-jdk-cipher-only.patch?rev=1.1&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/vuze/files/patches-4.2.0.0/0002-use-jdk-cipher-only.patch?rev=1.1&content-type=text/plain |
| 53 |
|
| 54 |
Index: 0002-use-jdk-cipher-only.patch |
| 55 |
=================================================================== |
| 56 |
diff --git a/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java b/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java |
| 57 |
index f4e1754..80d931f 100644 |
| 58 |
--- a/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java |
| 59 |
+++ b/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java |
| 60 |
@@ -36,7 +36,6 @@ import org.bouncycastle.crypto.CipherParameters; |
| 61 |
import org.bouncycastle.crypto.encodings.PKCS1Encoding; |
| 62 |
import org.bouncycastle.crypto.engines.RSAEngine; |
| 63 |
import org.bouncycastle.crypto.params.ParametersWithRandom; |
| 64 |
-import org.bouncycastle.jce.provider.RSAUtil; |
| 65 |
import org.gudy.azureus2.core3.util.Debug; |
| 66 |
import org.gudy.azureus2.core3.util.RandomUtils; |
| 67 |
import org.gudy.azureus2.plugins.utils.StaticUtilities; |
| 68 |
@@ -83,30 +82,12 @@ SecureMessageServiceClientHelper |
| 69 |
|
| 70 |
byte[] secret_bytes = session_key.getEncoded(); |
| 71 |
|
| 72 |
- try{ |
| 73 |
Cipher rsa_cipher = Cipher.getInstance( "RSA" ); |
| 74 |
|
| 75 |
rsa_cipher.init( Cipher.ENCRYPT_MODE, public_key ); |
| 76 |
|
| 77 |
encryped_session_key = rsa_cipher.doFinal( secret_bytes ); |
| 78 |
|
| 79 |
- }catch( Throwable e ){ |
| 80 |
- |
| 81 |
- // fallback to the BC implementation for jdk1.4.2 as JCE RSA not available |
| 82 |
- |
| 83 |
- RSAEngine eng = new RSAEngine(); |
| 84 |
- |
| 85 |
- PKCS1Encoding padded_eng = new PKCS1Encoding( eng ); |
| 86 |
- |
| 87 |
- CipherParameters param = RSAUtil.generatePublicKeyParameter(public_key); |
| 88 |
- |
| 89 |
- param = new ParametersWithRandom(param, RandomUtils.SECURE_RANDOM); |
| 90 |
- |
| 91 |
- padded_eng.init( true, param ); |
| 92 |
- |
| 93 |
- encryped_session_key = padded_eng.processBlock(secret_bytes, 0, secret_bytes.length); |
| 94 |
- } |
| 95 |
- |
| 96 |
}catch( Throwable e ){ |
| 97 |
|
| 98 |
e.printStackTrace(); |
| 99 |
-- |
| 100 |
1.6.2 |
Archives