/hg/icedtea6: Drop patches/ssl.patch

[omajid at icedtea.classpath.org]

changeset c82aadb00357 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c82aadb00357
author: Omair Majid <omajid at redhat.com>
date: Thu Apr 28 12:55:41 2011 -0400

	Drop patches/ssl.patch

	2011-04-28 Omair Majid <omajid at redhat.com>

	 Drop ssl.patch
	    * Makefile.am (ICEDTEA_PATCHES): Remove ssl.patch.
	    * patches/ssl.patch: Removed.


diffstat:

 ChangeLog         |   6 ++++++
 Makefile.am       |   1 -
 patches/ssl.patch |  41 -----------------------------------------
 3 files changed, 6 insertions(+), 42 deletions(-)

diffs (71 lines):

diff -r ad45dd8bcf45 -r c82aadb00357 ChangeLog
--- a/ChangeLog	Thu Apr 28 08:36:21 2011 -0400
+++ b/ChangeLog	Thu Apr 28 12:55:41 2011 -0400
@@ -1,3 +1,9 @@
+2011-04-28  Omair Majid  <omajid at redhat.com>
+
+	Drop ssl.patch
+	* Makefile.am (ICEDTEA_PATCHES): Remove ssl.patch.
+	* patches/ssl.patch: Removed.
+
 2011-04-28  Denis Lila <dlila at redhat.com>
 
 	* Makefile.am: Apply patches.
diff -r ad45dd8bcf45 -r c82aadb00357 Makefile.am
--- a/Makefile.am	Thu Apr 28 08:36:21 2011 -0400
+++ b/Makefile.am	Thu Apr 28 12:55:41 2011 -0400
@@ -217,7 +217,6 @@
 	patches/version.patch \
 	patches/version-hotspot.patch \
 	patches/hotspot/$(HSBUILD)/text-relocations.patch \
-	patches/ssl.patch \
 	patches/rmi_amd64.patch \
 	patches/tools.patch \
 	patches/use-system-tzdata.patch \
diff -r ad45dd8bcf45 -r c82aadb00357 patches/ssl.patch
--- a/patches/ssl.patch	Thu Apr 28 08:36:21 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
---- ../openjdkb23/openjdk/jdk/src/share/classes/sun/security/ssl/Handshaker.java	2007-10-30 04:38:10.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/Handshaker.java	2007-11-13 13:06:01.000000000 -0500
-@@ -36,6 +36,7 @@
- import java.security.PrivilegedExceptionAction;
- import java.security.PrivilegedActionException;
- import java.security.cert.X509Certificate;
-+import java.security.spec.AlgorithmParameterSpec;
- 
- import javax.crypto.*;
- import javax.crypto.spec.*;
-@@ -688,8 +683,8 @@
-         SecretKey masterSecret;
-         try {
-             KeyGenerator kg = JsseJce.getKeyGenerator("SunTlsMasterSecret");
--            kg.init(spec);
--            masterSecret = kg.generateKey();
-+            kg.init((AlgorithmParameterSpec) spec);
-+	    masterSecret = kg.generateKey();
-         } catch (GeneralSecurityException e) {
-             // For RSA premaster secrets, do not signal a protocol error
-             // due to the Bleichenbacher attack. See comments further down.
---- ../openjdkb23/openjdk/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java	2007-10-30 04:38:10.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java	2007-11-13 13:06:42.000000000 -0500
-@@ -36,6 +36,8 @@
- import javax.net.ssl.*;
- 
- import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
-+import java.security.spec.AlgorithmParameterSpec;
-+
- 
- /**
-  * This is the client key exchange message (CLIENT --> SERVER) used with
-@@ -104,8 +106,8 @@
- 
-         try {
-             KeyGenerator kg = JsseJce.getKeyGenerator("SunTlsRsaPremasterSecret");
--            kg.init(new TlsRsaPremasterSecretParameterSpec(major, minor));
--            preMaster = kg.generateKey();
-+            kg.init((AlgorithmParameterSpec) (new TlsRsaPremasterSecretParameterSpec(major, minor)));
-+	    preMaster = kg.generateKey();
- 
-             Cipher cipher = JsseJce.getCipher(JsseJce.CIPHER_RSA_PKCS1);
-             cipher.init(Cipher.WRAP_MODE, publicKey, generator);