Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8259707: LDAP channel binding does not work with StartTLS extension #2085

Closed
wants to merge 4 commits into from
Closed
Changes from 1 commit
Commits
File filter
Filter file types
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.

Always

Just for now

@@ -1031,7 +1031,12 @@ public boolean isTlsConnection() {
return (sock instanceof SSLSocket) || isUpgradedToStartTls;
}

private HandshakeListener tlsHandshakeListener;
/*
* tlsHandshakeListener can be created for initial secure connection
* and updated by StartTLS extended operation. It is used later by LdapClient
* to create TLS Channel Binding data on the base of TLS server certificate
*/
private volatile HandshakeListener tlsHandshakeListener;

synchronized public void setHandshakeCompletedListener(SSLSocket sslSocket) {
if (tlsHandshakeListener != null)
@@ -1056,7 +1061,7 @@ public X509Certificate getTlsServerCertificate()

private class HandshakeListener implements HandshakeCompletedListener {

private CompletableFuture<X509Certificate> tlsHandshakeCompleted =
private final CompletableFuture<X509Certificate> tlsHandshakeCompleted =
new CompletableFuture<>();
@Override
public void handshakeCompleted(HandshakeCompletedEvent event) {
ProTip! Use n and p to navigate between commits in a pull request.