FS-4452 --resolve

This commit is contained in:
Anthony Minessale 2013-03-06 12:58:22 -06:00
parent 3e4fb4b0a2
commit 9b11dbe4b9
2 changed files with 8 additions and 8 deletions

View File

@ -1 +1 @@
Fri Mar 1 15:47:13 CST 2013
Wed Mar 6 12:57:17 CST 2013

View File

@ -303,6 +303,7 @@ int tls_init_context(tls_t *tls, tls_issues_t const *ti)
meth = SSLv23_method();
tls->ctx = SSL_CTX_new((SSL_METHOD*)meth);
SSL_CTX_sess_set_remove_cb(tls->ctx, NULL);
}
if (tls->ctx == NULL) {
@ -399,14 +400,14 @@ void tls_free(tls_t *tls)
if (!tls)
return;
if (tls->con != NULL)
if (tls->con != NULL) {
SSL_shutdown(tls->con);
SSL_free(tls->con), tls->con = NULL;
}
if (tls->ctx != NULL && tls->type != tls_slave)
if (tls->ctx != NULL && tls->type != tls_slave) {
SSL_CTX_free(tls->ctx);
if (tls->bio_con != NULL)
BIO_free(tls->bio_con);
}
su_home_unref(tls->home);
}
@ -475,7 +476,6 @@ tls_t *tls_init_secondary(tls_t *master, int sock, int accept)
if (tls) {
tls->ctx = master->ctx;
tls->type = master->type;
tls->accept = accept ? 1 : 0;
tls->verify_outgoing = master->verify_outgoing;
tls->verify_incoming = master->verify_incoming;