RFR+RFA [11u] 8214339: SSLSocketImpl erroneously wraps SocketException

zgu at redhat.com zgu at redhat.com
Tue Feb 19 15:55:06 UTC 2019


Looks good to me.

-Zhengyu

On Tue, 2019-02-19 at 15:28 +0100, Aleksey Shipilev wrote:
> Please review and approve the backport to 11u for this bug.
> 
>   Original Bug:
>       URL: https://bugs.openjdk.java.net/browse/JDK-8214339
>       Reporter: Webbug Group
>       Assignee: Xue-Lei Fan
>       Priority: P3
>       Components: security-libs
> 
>   Original Fix:
>         12: JDK-8214339, http://hg.openjdk.java.net/jdk/jdk12/rev/904
> 1178a0b69, 66 day(s) ago
> 
>   Backports and Forwardports:
>         13: 13, JDK-8215663, http://hg.openjdk.java.net/jdk/jdk/rev/9
> 041178a0b69, 62 day(s) ago
>         11: MISSING
>          8: Not affected
> 
> The patch does not apply cleanly to 11u, because it has trivial
> formatting conflict:
> 
> $ cat
> src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.ja
> va.rej
> --- PreSharedKeyExtension.java
> +++ PreSharedKeyExtension.java
> @@ -171,7 +171,7 @@
> 
> -            for(PskIdentity curId : identities) {
> +            for (PskIdentity curId : identities) {
>                  idEncodedLength += curId.getEncodedLength();
> 
> @@ -194,7 +194,7 @@
>              Record.putInt16(m, idsEncodedLength);
> -            for(PskIdentity curId : identities) {
> +            for (PskIdentity curId : identities) {
>                  curId.writeEncoded(m);
> 
> That code is already in this form in 11u.
> 
> Full webrev for 11u:
>   http://cr.openjdk.java.net/~shade/8214339/webrev.11u.01/
> 
> Testing: new test, entire jdk_security test suite; verified new test
> fails without the patch
> 
> Thanks,
> -Aleksey
> 


More information about the jdk-updates-dev mailing list