Bill opened a new pull request #6626: URL: https://github.com/apache/geode/pull/6626
This PR is draft until I run some manual tests here since this was not a straightforward merge. These two commits were cherry-picked from the support/1.13 back-port PR [#6618](https://github.com/apache/geode/pull/6618) since that PR had to resolve a number of tricky conflicts. In addition to those conflicts I saw on support/1.12, I had to resolve issues with a confounding commit: GEODE-8419 "SSL Configuration ignored" had been back-ported already to 1.12 but there was an error in that back-port: `clientSocket` was still referenced in `SocketCreator.handshakeSSLSocketChannel()`. I removed those remnants since the fix for GEODE-8419 moved all that configuration into `SocketCreator.configureSSLEngine()`. The parameter was removed in GEODE-9141 and in this PR I removed this remnant: ```java engine.setUseClientMode(clientSocket); if (!clientSocket) { engine.setNeedClientAuth(sslConfig.isRequireAuth()); } ``` - [x] Is there a JIRA ticket associated with this PR? Is it referenced in the commit message? - [x] Has your PR been rebased against the latest commit within the target branch (typically `develop`)? - [ ] Is your initial contribution a single, squashed commit? NO this needs to be merged as two commits - [x] Does `gradlew build` run cleanly? - [x] Have you written or updated unit tests to verify your changes? - [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
