# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1325855877 0
# Node ID e7e4c22d19465da4a23104be47649dd3a479bd7b
# Parent  33616a2b4d2ea466670c8ec25e962b4df96e6f50
S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA

2011-12-22  Andrew John Hughes  <ahughes@redhat.com>

	* Makefile.am: Add new patch.
	* patches/openjdk/7103725-ssl_beast_regression.patch:
	Add OpenJDK backport.
	* NEWS: Updated.

diff -r 33616a2b4d2e -r e7e4c22d1946 ChangeLog
--- a/ChangeLog	Thu Jan 05 11:45:54 2012 -0500
+++ b/ChangeLog	Fri Jan 06 13:17:57 2012 +0000
@@ -1,3 +1,10 @@
+2011-12-22  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/openjdk/7103725-ssl_beast_regression.patch:
+	Add OpenJDK backport.
+	* NEWS: Updated.
+
 2012-01-04 Omair Majid  <omajid@redhat.com>
 
 	S7102369, S7094468: remove java.rmi.server.codebase property parsing from
diff -r 33616a2b4d2e -r e7e4c22d1946 Makefile.am
--- a/Makefile.am	Thu Jan 05 11:45:54 2012 -0500
+++ b/Makefile.am	Fri Jan 06 13:17:57 2012 +0000
@@ -402,7 +402,8 @@
 	patches/mark_sun_toolkit_privileged_code.patch \
 	patches/support_linux_3.patch \
 	patches/libpng-1.5.patch \
-	patches/openjdk/7102369-7094468-rmiregistry.patch
+	patches/openjdk/7102369-7094468-rmiregistry.patch \
+	patches/openjdk/7103725-ssl_beast_regression.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
diff -r 33616a2b4d2e -r e7e4c22d1946 NEWS
--- a/NEWS	Thu Jan 05 11:45:54 2012 -0500
+++ b/NEWS	Fri Jan 06 13:17:57 2012 +0000
@@ -13,6 +13,7 @@
 * Backports
   - S7102369: remove java.rmi.server.codebase property parsing from registyimpl
   - S7094468: rmiregistry clean up
+  - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA
 
 New in release 1.8.11 (2011-11-08):
 
diff -r 33616a2b4d2e -r e7e4c22d1946 patches/openjdk/7103725-ssl_beast_regression.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7103725-ssl_beast_regression.patch	Fri Jan 06 13:17:57 2012 +0000
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User robm
+# Date 1324518632 0
+# Node ID cb20ed4b953add8f2443831a0552640efca53ab7
+# Parent  6b46f3c7c97cb060f88b196171b95d33bff80b7c
+7103725: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA
+Summary: resolving an issue with 7064341.
+Reviewed-by: wetmore, coffeys
+
+diff -r 6b46f3c7c97c -r cb20ed4b953a src/share/classes/sun/security/ssl/AppOutputStream.java
+--- openjdk/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java	Wed Nov 16 13:14:57 2011 +0000
++++ openjdk/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java	Thu Dec 22 01:50:32 2011 +0000
+@@ -90,7 +90,8 @@
+             do {
+                 int howmuch;
+                 if (isFirstRecordOfThePayload && c.needToSplitPayload()) {
+-                    howmuch = Math.min(0x01, r.availableDataBytes());
++                    howmuch = (len == 0) ? 0 : Math.min(
++                        0x01, r.availableDataBytes());
+                 } else {
+                     howmuch = Math.min(len, r.availableDataBytes());
+                 }