Skip to content

Commit

Permalink
corrected a merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
franku committed Oct 2, 2018
1 parent 392d9c7 commit 2e209e8
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions core/src/lib/tls_openssl_private.cc
Expand Up @@ -364,6 +364,7 @@ void TlsOpenSslPrivate::ClientContextInsertCredentials(const PskCredentials &cre
} else {
TlsOpenSslPrivate::psk_client_credentials_.insert(
std::pair<const SSL_CTX *, PskCredentials>(openssl_ctx_, credentials));
}
}

unsigned int TlsOpenSslPrivate::psk_server_cb(SSL *ssl,
Expand Down

0 comments on commit 2e209e8

Please sign in to comment.