| 1 |
betelgeuse 08/04/20 14:39:09 |
| 2 |
|
| 3 |
Added: use-jdk-cipher-only.patch remove-osx-platform.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
(Portage version: 2.1.5_rc3) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-p2p/azureus/files/patches-3.0.5.2/use-jdk-cipher-only.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.5.2/use-jdk-cipher-only.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.5.2/use-jdk-cipher-only.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: use-jdk-cipher-only.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur work.old/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java work/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java |
| 17 |
--- work.old/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java 2008-04-20 15:29:59.000000000 +0300 |
| 18 |
+++ work/com/aelitis/azureus/core/clientmessageservice/secure/impl/SecureMessageServiceClientHelper.java 2008-04-20 15:35:56.000000000 +0300 |
| 19 |
@@ -36,7 +36,7 @@ |
| 20 |
import org.bouncycastle.crypto.encodings.PKCS1Encoding; |
| 21 |
import org.bouncycastle.crypto.engines.RSAEngine; |
| 22 |
import org.bouncycastle.crypto.params.ParametersWithRandom; |
| 23 |
-import org.bouncycastle.jce.provider.RSAUtil; |
| 24 |
+//import org.bouncycastle.jce.provider.RSAUtil; |
| 25 |
import org.gudy.azureus2.core3.util.Debug; |
| 26 |
import org.gudy.azureus2.plugins.utils.StaticUtilities; |
| 27 |
|
| 28 |
@@ -82,13 +82,15 @@ |
| 29 |
|
| 30 |
byte[] secret_bytes = session_key.getEncoded(); |
| 31 |
|
| 32 |
- try{ |
| 33 |
+ //try{ |
| 34 |
Cipher rsa_cipher = Cipher.getInstance( "RSA" ); |
| 35 |
|
| 36 |
rsa_cipher.init( Cipher.ENCRYPT_MODE, public_key ); |
| 37 |
|
| 38 |
encryped_session_key = rsa_cipher.doFinal( secret_bytes ); |
| 39 |
- |
| 40 |
+ |
| 41 |
+ /* Gentoo: Depend on JDK >=1.5 so we don't need this code. This does not work |
| 42 |
+ * with our packaged bcprov |
| 43 |
}catch( Throwable e ){ |
| 44 |
|
| 45 |
// fallback to the BC implementation for jdk1.4.2 as JCE RSA not available |
| 46 |
@@ -105,6 +107,7 @@ |
| 47 |
|
| 48 |
encryped_session_key = padded_eng.processBlock(secret_bytes, 0, secret_bytes.length); |
| 49 |
} |
| 50 |
+ */ |
| 51 |
|
| 52 |
}catch( Throwable e ){ |
| 53 |
|
| 54 |
Only in work.old/org: bouncycastle |
| 55 |
Only in work.old/org/gudy/azureus2/platform: macosx |
| 56 |
Only in work.old/org/gudy/azureus2/ui/swt: osx |
| 57 |
Only in work.old/org/gudy/azureus2/ui/swt: test |
| 58 |
Only in work.old/org/gudy/azureus2/ui/swt/win32: Win32UIEnhancer.java |
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
1.1 net-p2p/azureus/files/patches-3.0.5.2/remove-osx-platform.patch |
| 63 |
|
| 64 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.5.2/remove-osx-platform.patch?rev=1.1&view=markup |
| 65 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/azureus/files/patches-3.0.5.2/remove-osx-platform.patch?rev=1.1&content-type=text/plain |
| 66 |
|
| 67 |
Index: remove-osx-platform.patch |
| 68 |
=================================================================== |
| 69 |
diff -ur work.old/org/gudy/azureus2/platform/PlatformManagerFactory.java work/org/gudy/azureus2/platform/PlatformManagerFactory.java |
| 70 |
--- work.old/org/gudy/azureus2/platform/PlatformManagerFactory.java 2008-04-20 15:53:14.000000000 +0300 |
| 71 |
+++ work/org/gudy/azureus2/platform/PlatformManagerFactory.java 2008-04-20 15:53:31.000000000 +0300 |
| 72 |
@@ -52,7 +52,7 @@ |
| 73 |
|
| 74 |
}else if( getPlatformType() == PlatformManager.PT_MACOSX ){ |
| 75 |
|
| 76 |
- platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton(); |
| 77 |
+ //platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton(); |
| 78 |
|
| 79 |
}else if( getPlatformType() == PlatformManager.PT_UNIX ){ |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
-- |
| 85 |
gentoo-commits@l.g.o mailing list |
Archives