search

corretto / corretto-11

Amazon Corretto 11 is a no-cost, multi-platform, production-ready distribution of OpenJDK 11
GNU General Public License v2.0
672 stars 106 forks source link

Dtls merge fix #364

Closed lutkerd closed 6 months ago

lutkerd commented 6 months ago

See the most recent commits.

Fixing the merge conflict from disabling DTLSv1.0. This pulls the SSLContextDefault.java tests from upstream, patches it to work with TLS1/1.1 enabled, then merges from upstream and updated the test again to expect DTLS 1.0 to be enabled.

make run-test TEST="test/jdk/sun/security/ssl/SSLContextImpl/SSLContextDefault.java"

==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR   
   jtreg:test/jdk/sun/security/ssl/SSLContextImpl/SSLContextDefault.java
                                                         1     1     0     0   
==============================
TEST SUCCESS
mrserb commented 6 months ago

I am not sure how to review the changes in 500 files in 133 commits

lutkerd commented 6 months ago

I understand, I can try to merge everything up the the point merges starting failing and see if that makes it easier. The thing I am changing are just the 4 commits at the end and everything else should be a merge from upstream.