Skip to content

tls_in_peerdn/tls_in_peercert fix for OpenSSL #26

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tls_in_peerdn/tls_in_peercert fix for OpenSSL #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/src/tls-openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,12 @@ verify_callback(int state, X509_STORE_CTX *x509ctx,
X509 * cert = X509_STORE_CTX_get_current_cert(x509ctx);
static uschar txt[256];

if (tlsp->peercert)
X509_free(tlsp->peercert);
tlsp->peercert = X509_dup(cert);

X509_NAME_oneline(X509_get_subject_name(cert), CS txt, sizeof(txt));
tlsp->peerdn = txt;

if (state == 0)
{
Expand All @@ -289,7 +294,6 @@ if (state == 0)
*calledp = TRUE;
if (!*optionalp)
{
tlsp->peercert = X509_dup(cert);
return 0; /* reject */
}
DEBUG(D_tls) debug_printf("SSL verify failure overridden (host in "
Expand Down Expand Up @@ -318,9 +322,6 @@ else
uschar * verify_cert_hostnames;
#endif

tlsp->peerdn = txt;
tlsp->peercert = X509_dup(cert);

#ifdef EXPERIMENTAL_CERTNAMES
if ( tlsp == &tls_out
&& ((verify_cert_hostnames = client_static_cbinfo->verify_cert_hostnames)))
Expand Down