If you simply generate the changeset with "hg backout", I think it will be quite safe.

-Max

On 3/13/13 8:10 AM, Valerie (Yu-Ching) Peng wrote:
Changes look fine.
Thanks,
Valerie
On 03/12/13 15:04, Brad Wetmore wrote:

Valerie,

Here is the codereview for the merge problem with the AEAD
ciphersuites I told you about.  The safest way to resolve is to pull
the JSSE portion of AEAD until Xuelei is back to fix the merge problem.

It will be easier to do a straight comparison of the pre-AEAD
Ciphersuite directories/files than read the webrevs.  More information
about that in a separate email.  But here's the webrev FYI:

    http://cr.openjdk.java.net/~wetmore/8009925/webrev.00/

The original changeset:

    http://hg.openjdk.java.net/jdk8/tl/jdk/rev/def2e05299b7

    changeset:   6635:def2e05299b7
    user:        xuelei
    date:        Fri Mar 01 02:34:34 2013 -0800
    summary:     7030966: Support AEAD CipherSuites

Here's the previous changeset:

    changeset:   6634:7246a6e4dd5a
    user:        juh
    date:        Thu Feb 28 16:36:01 2013 -0800
    summary:     8006853: OCSP timeout set to wrong value if \
                 com.sun.security.ocsp.timeout < 0

I would suggest to clone/update to 6634:7246a6e4dd5a, and compare the
files and file contents.

I'll send you the closed information in a separate email.

Thanks,

Brad



Reply via email to