s4:lib/tls: add support for gnutls_certificate_set_x509_{system_trust,trust_dir}()
[samba.git] / source4 / lib / tls / tls_tstream.c
index 347c47ed48eb14bdd30c258a371e61dce461f80b..6b2c4c674c9b88fe3626d3b8fdbf74e8cf7a383e 100644 (file)
 #include "../lib/tsocket/tsocket_internal.h"
 #include "../lib/util/util_net.h"
 #include "lib/tls/tls.h"
+#include "lib/param/param.h"
 
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
+#include "lib/crypto/gnutls_helpers.h"
 
 #define DH_BITS 2048
 
@@ -63,9 +65,13 @@ struct tstream_tls {
 
        gnutls_session_t tls_session;
 
+       bool is_server;
+
        enum tls_verify_peer_state verify_peer;
        const char *peer_name;
 
+       DATA_BLOB channel_bindings;
+
        struct tevent_context *current_ev;
 
        struct tevent_immediate *retry_im;
@@ -886,7 +892,66 @@ bool tstream_tls_params_enabled(struct tstream_tls_params *tls_params)
        return tlsp->tls_enabled;
 }
 
+static NTSTATUS tstream_tls_setup_channel_bindings(struct tstream_tls *tlss)
+{
+       gnutls_datum_t cb = { .size = 0 };
+       int ret;
+
+#ifdef HAVE_GNUTLS_CB_TLS_SERVER_END_POINT
+       ret = gnutls_session_channel_binding(tlss->tls_session,
+                                            GNUTLS_CB_TLS_SERVER_END_POINT,
+                                            &cb);
+#else /* not HAVE_GNUTLS_CB_TLS_SERVER_END_POINT */
+       ret = legacy_gnutls_server_end_point_cb(tlss->tls_session,
+                                               tlss->is_server,
+                                               &cb);
+#endif /* not HAVE_GNUTLS_CB_TLS_SERVER_END_POINT */
+       if (ret != GNUTLS_E_SUCCESS) {
+               return gnutls_error_to_ntstatus(ret,
+                               NT_STATUS_CRYPTO_SYSTEM_INVALID);
+       }
+
+       if (cb.size != 0) {
+               /*
+                * Looking at the OpenLDAP implementation
+                * for LDAP_OPT_X_SASL_CBINDING_TLS_ENDPOINT
+                * revealed that we need to prefix it with
+                * 'tls-server-end-point:'
+                */
+               const char endpoint_prefix[] = "tls-server-end-point:";
+               size_t prefix_size = strlen(endpoint_prefix);
+               size_t size = prefix_size + cb.size;
+
+               tlss->channel_bindings = data_blob_talloc_named(tlss, NULL, size,
+                                                               "tls_channel_bindings");
+               if (tlss->channel_bindings.data == NULL) {
+                       gnutls_free(cb.data);
+                       return NT_STATUS_NO_MEMORY;
+               }
+               memcpy(tlss->channel_bindings.data, endpoint_prefix, prefix_size);
+               memcpy(tlss->channel_bindings.data + prefix_size, cb.data, cb.size);
+               gnutls_free(cb.data);
+       }
+
+       return NT_STATUS_OK;
+}
+
+const DATA_BLOB *tstream_tls_channel_bindings(struct tstream_context *tls_tstream)
+{
+       struct tstream_tls *tlss =
+               talloc_get_type(_tstream_context_data(tls_tstream),
+               struct tstream_tls);
+
+       if (tlss == NULL) {
+               return NULL;
+       }
+
+       return &tlss->channel_bindings;
+}
+
 NTSTATUS tstream_tls_params_client(TALLOC_CTX *mem_ctx,
+                                  bool system_cas,
+                                  const char * const *ca_dirs,
                                   const char *ca_file,
                                   const char *crl_file,
                                   const char *tls_priority,
@@ -896,6 +961,8 @@ NTSTATUS tstream_tls_params_client(TALLOC_CTX *mem_ctx,
 {
        struct tstream_tls_params *__tlsp = NULL;
        struct tstream_tls_params_internal *tlsp = NULL;
+       bool got_ca = false;
+       size_t i;
        int ret;
 
        __tlsp = talloc_zero(mem_ctx, struct tstream_tls_params);
@@ -933,6 +1000,40 @@ NTSTATUS tstream_tls_params_client(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
+       if (system_cas) {
+               ret = gnutls_certificate_set_x509_system_trust(tlsp->x509_cred);
+               if (ret < 0) {
+                       DBG_ERR("gnutls_certificate_set_x509_system_trust() - %s\n",
+                               gnutls_strerror(ret));
+                       TALLOC_FREE(__tlsp);
+                       return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+               }
+               if (ret > 0) {
+                       got_ca = true;
+               }
+       }
+
+       for (i = 0; ca_dirs != NULL && ca_dirs[i] != NULL; i++) {
+               const char *ca_dir = ca_dirs[i];
+
+               if (!directory_exist(ca_dir)) {
+                       continue;
+               }
+
+               ret = gnutls_certificate_set_x509_trust_dir(tlsp->x509_cred,
+                                                           ca_dir,
+                                                           GNUTLS_X509_FMT_PEM);
+               if (ret < 0) {
+                       DBG_ERR("gnutls_certificate_set_x509_trust_dir(%s) - %s\n",
+                               ca_dir, gnutls_strerror(ret));
+                       TALLOC_FREE(__tlsp);
+                       return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+               }
+               if (ret > 0) {
+                       got_ca = true;
+               }
+       }
+
        if (ca_file && *ca_file && file_exist(ca_file)) {
                ret = gnutls_certificate_set_x509_trust_file(tlsp->x509_cred,
                                                             ca_file,
@@ -943,11 +1044,17 @@ NTSTATUS tstream_tls_params_client(TALLOC_CTX *mem_ctx,
                        TALLOC_FREE(__tlsp);
                        return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
                }
-       } else if (tlsp->verify_peer >= TLS_VERIFY_PEER_CA_ONLY) {
-               DEBUG(0,("TLS failed to missing cafile %s - "
-                        "with 'tls verify peer = %s'\n",
-                        ca_file,
-                        tls_verify_peer_string(tlsp->verify_peer)));
+               if (ret > 0) {
+                       got_ca = true;
+               }
+       }
+
+       if (!got_ca && tlsp->verify_peer >= TLS_VERIFY_PEER_CA_ONLY) {
+               D_ERR("TLS: 'tls verify peer = %s' requires "
+                     "'tls trust system cas', "
+                     "'tls ca directories' or "
+                     "'tls cafile'\n",
+                     tls_verify_peer_string(tlsp->verify_peer));
                TALLOC_FREE(__tlsp);
                return NT_STATUS_INVALID_PARAMETER_MIX;
        }
@@ -983,40 +1090,80 @@ NTSTATUS tstream_tls_params_client(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-struct tstream_tls_connect_state {
-       struct tstream_context *tls_stream;
-};
-
-struct tevent_req *_tstream_tls_connect_send(TALLOC_CTX *mem_ctx,
-                                            struct tevent_context *ev,
-                                            struct tstream_context *plain_stream,
-                                            struct tstream_tls_params *_tls_params,
-                                            const char *location)
+NTSTATUS tstream_tls_params_client_lpcfg(TALLOC_CTX *mem_ctx,
+                                        struct loadparm_context *lp_ctx,
+                                        const char *peer_name,
+                                        struct tstream_tls_params **tlsp)
 {
-       struct tevent_req *req;
-       struct tstream_tls_connect_state *state;
-       const char *error_pos;
-       struct tstream_tls *tlss;
-       struct tstream_tls_params_internal *tls_params = NULL;
-       int ret;
-       unsigned int flags = GNUTLS_CLIENT;
+       TALLOC_CTX *frame = talloc_stackframe();
+       bool system_cas = false;
+       const char * const *ca_dirs = NULL;
+       const char *ptr = NULL;
+       char *ca_file = NULL;
+       char *crl_file = NULL;
+       const char *tls_priority = NULL;
+       enum tls_verify_peer_state verify_peer =
+               TLS_VERIFY_PEER_AS_STRICT_AS_POSSIBLE;
+       NTSTATUS status;
+
+       system_cas = lpcfg_tls_trust_system_cas(lp_ctx);
+       ca_dirs = lpcfg_tls_ca_directories(lp_ctx);
+
+       ptr = lpcfg__tls_cafile(lp_ctx);
+       if (ptr != NULL) {
+               ca_file = lpcfg_tls_cafile(frame, lp_ctx);
+               if (ca_file == NULL) {
+                       TALLOC_FREE(frame);
+                       return NT_STATUS_NO_MEMORY;
+               }
+       }
 
-       req = tevent_req_create(mem_ctx, &state,
-                               struct tstream_tls_connect_state);
-       if (req == NULL) {
-               return NULL;
+       ptr = lpcfg__tls_crlfile(lp_ctx);
+       if (ptr != NULL) {
+               crl_file = lpcfg_tls_crlfile(frame, lp_ctx);
+               if (crl_file == NULL) {
+                       TALLOC_FREE(frame);
+                       return NT_STATUS_NO_MEMORY;
+               }
        }
 
-       state->tls_stream = tstream_context_create(state,
-                                                  &tstream_tls_ops,
-                                                  &tlss,
-                                                  struct tstream_tls,
-                                                  location);
-       if (tevent_req_nomem(state->tls_stream, req)) {
-               return tevent_req_post(req, ev);
+       tls_priority = lpcfg_tls_priority(lp_ctx);
+       verify_peer = lpcfg_tls_verify_peer(lp_ctx);
+
+       status = tstream_tls_params_client(mem_ctx,
+                                          system_cas,
+                                          ca_dirs,
+                                          ca_file,
+                                          crl_file,
+                                          tls_priority,
+                                          verify_peer,
+                                          peer_name,
+                                          tlsp);
+       TALLOC_FREE(frame);
+       return status;
+}
+
+static NTSTATUS tstream_tls_prepare_gnutls(struct tstream_tls_params *_tlsp,
+                                          struct tstream_tls *tlss)
+{
+       struct tstream_tls_params_internal *tlsp = NULL;
+       int ret;
+       unsigned int flags;
+       const char *hostname = NULL;
+
+       if (tlss->is_server) {
+               flags = GNUTLS_SERVER;
+       } else {
+               flags = GNUTLS_CLIENT;
+               /*
+                * tls_tstream can't properly handle 'New Session Ticket'
+                * messages sent 'after' the client sends the 'Finished'
+                * message.  GNUTLS_NO_TICKETS was introduced in GnuTLS 3.5.6.
+                * This flag is to indicate the session Flag session should not
+                * use resumption with session tickets.
+                */
+               flags |= GNUTLS_NO_TICKETS;
        }
-       ZERO_STRUCTP(tlss);
-       talloc_set_destructor(tlss, tstream_tls_destructor);
 
        /*
         * Note we need to make sure x509_cred and dh_params
@@ -1028,71 +1175,200 @@ struct tevent_req *_tstream_tls_connect_send(TALLOC_CTX *mem_ctx,
         *
         * Note: here we use talloc_reference() in a way
         *       that does not expose it to the caller.
-        *
         */
-       tls_params = talloc_reference(tlss, _tls_params->internal);
-       if (tevent_req_nomem(tls_params, req)) {
-               return tevent_req_post(req, ev);
+       tlsp = talloc_reference(tlss, _tlsp->internal);
+       if (tlsp == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       tlss->plain_stream = plain_stream;
-       tlss->verify_peer = tls_params->verify_peer;
-       if (tls_params->peer_name != NULL) {
-               tlss->peer_name = talloc_strdup(tlss, tls_params->peer_name);
-               if (tevent_req_nomem(tlss->peer_name, req)) {
-                       return tevent_req_post(req, ev);
+       tlss->verify_peer = tlsp->verify_peer;
+       if (tlsp->peer_name != NULL) {
+               bool ip = is_ipaddress(tlsp->peer_name);
+
+               tlss->peer_name = talloc_strdup(tlss, tlsp->peer_name);
+               if (tlss->peer_name == NULL) {
+                       return NT_STATUS_NO_MEMORY;
                }
-       }
 
-       tlss->current_ev = ev;
-       tlss->retry_im = tevent_create_immediate(tlss);
-       if (tevent_req_nomem(tlss->retry_im, req)) {
-               return tevent_req_post(req, ev);
+               if (!ip) {
+                       hostname = tlss->peer_name;
+               }
+
+               if (tlss->verify_peer < TLS_VERIFY_PEER_CA_AND_NAME) {
+                       hostname = NULL;
+               }
        }
 
-#ifdef GNUTLS_NO_TICKETS
-       /*
-        * tls_tstream can't properly handle 'New Session Ticket' messages
-        * sent 'after' the client sends the 'Finished' message.
-        * GNUTLS_NO_TICKETS was introduced in GnuTLS 3.5.6.  This flag is to
-        * indicate the session Flag session should not use resumption with
-        * session tickets.
-        */
-       flags |= GNUTLS_NO_TICKETS;
-#endif
+       if (tlss->current_ev != NULL) {
+               tlss->retry_im = tevent_create_immediate(tlss);
+               if (tlss->retry_im == NULL) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+       }
 
        ret = gnutls_init(&tlss->tls_session, flags);
        if (ret != GNUTLS_E_SUCCESS) {
-               DEBUG(0,("TLS %s - %s\n", __location__, gnutls_strerror(ret)));
-               tevent_req_error(req, EINVAL);
-               return tevent_req_post(req, ev);
+               return gnutls_error_to_ntstatus(ret,
+                       NT_STATUS_CRYPTO_SYSTEM_INVALID);
        }
 
        ret = gnutls_set_default_priority(tlss->tls_session);
        if (ret != GNUTLS_E_SUCCESS) {
-               DBG_ERR("TLS %s - %s. Failed to set default priorities\n",
-                       __location__, gnutls_strerror(ret));
-               tevent_req_error(req, EINVAL);
-               return tevent_req_post(req, ev);
+               return gnutls_error_to_ntstatus(ret,
+                       NT_STATUS_CRYPTO_SYSTEM_INVALID);
        }
 
-       if (strlen(tls_params->tls_priority) > 0) {
+       if (strlen(tlsp->tls_priority) > 0) {
+               const char *error_pos = NULL;
+
                ret = gnutls_priority_set_direct(tlss->tls_session,
-                                                tls_params->tls_priority,
+                                                tlsp->tls_priority,
                                                 &error_pos);
                if (ret != GNUTLS_E_SUCCESS) {
-                       DEBUG(0,("TLS %s - %s.  Check 'tls priority' option at '%s'\n",
-                                __location__, gnutls_strerror(ret), error_pos));
-                       tevent_req_error(req, EINVAL);
-                       return tevent_req_post(req, ev);
+                       return gnutls_error_to_ntstatus(ret,
+                               NT_STATUS_CRYPTO_SYSTEM_INVALID);
                }
        }
 
        ret = gnutls_credentials_set(tlss->tls_session,
                                     GNUTLS_CRD_CERTIFICATE,
-                                    tls_params->x509_cred);
+                                    tlsp->x509_cred);
        if (ret != GNUTLS_E_SUCCESS) {
-               DEBUG(0,("TLS %s - %s\n", __location__, gnutls_strerror(ret)));
+               return gnutls_error_to_ntstatus(ret,
+                               NT_STATUS_CRYPTO_SYSTEM_INVALID);
+       }
+
+       if (hostname != NULL) {
+               ret = gnutls_server_name_set(tlss->tls_session,
+                                            GNUTLS_NAME_DNS,
+                                            hostname,
+                                            strlen(hostname));
+               if (ret != GNUTLS_E_SUCCESS) {
+                       return gnutls_error_to_ntstatus(ret,
+                                       NT_STATUS_CRYPTO_SYSTEM_INVALID);
+               }
+       }
+
+       if (tlss->is_server) {
+               gnutls_certificate_server_set_request(tlss->tls_session,
+                                                     GNUTLS_CERT_REQUEST);
+               gnutls_dh_set_prime_bits(tlss->tls_session, DH_BITS);
+       }
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS tstream_tls_verify_peer(struct tstream_tls *tlss)
+{
+       unsigned int status = UINT32_MAX;
+       bool ip = true;
+       const char *hostname = NULL;
+       int ret;
+
+       if (tlss->verify_peer == TLS_VERIFY_PEER_NO_CHECK) {
+               return NT_STATUS_OK;
+       }
+
+       if (tlss->peer_name != NULL) {
+               ip = is_ipaddress(tlss->peer_name);
+       }
+
+       if (!ip) {
+               hostname = tlss->peer_name;
+       }
+
+       if (tlss->verify_peer == TLS_VERIFY_PEER_CA_ONLY) {
+               hostname = NULL;
+       }
+
+       if (tlss->verify_peer >= TLS_VERIFY_PEER_CA_AND_NAME) {
+               if (hostname == NULL) {
+                       DEBUG(1,("TLS %s - no hostname available for "
+                                "verify_peer[%s] and peer_name[%s]\n",
+                                __location__,
+                                tls_verify_peer_string(tlss->verify_peer),
+                                tlss->peer_name));
+                       return NT_STATUS_IMAGE_CERT_REVOKED;
+               }
+       }
+
+       ret = gnutls_certificate_verify_peers3(tlss->tls_session,
+                                              hostname,
+                                              &status);
+       if (ret != GNUTLS_E_SUCCESS) {
+               return gnutls_error_to_ntstatus(ret,
+                       NT_STATUS_CRYPTO_SYSTEM_INVALID);
+       }
+
+       if (status != 0) {
+               DEBUG(1,("TLS %s - check failed for "
+                        "verify_peer[%s] and peer_name[%s] "
+                        "status 0x%x (%s%s%s%s%s%s%s%s)\n",
+                        __location__,
+                        tls_verify_peer_string(tlss->verify_peer),
+                        tlss->peer_name,
+                        status,
+                        status & GNUTLS_CERT_INVALID ? "invalid " : "",
+                        status & GNUTLS_CERT_REVOKED ? "revoked " : "",
+                        status & GNUTLS_CERT_SIGNER_NOT_FOUND ?
+                               "signer_not_found " : "",
+                        status & GNUTLS_CERT_SIGNER_NOT_CA ?
+                               "signer_not_ca " : "",
+                        status & GNUTLS_CERT_INSECURE_ALGORITHM ?
+                               "insecure_algorithm " : "",
+                        status & GNUTLS_CERT_NOT_ACTIVATED ?
+                               "not_activated " : "",
+                        status & GNUTLS_CERT_EXPIRED ?
+                               "expired " : "",
+                        status & GNUTLS_CERT_UNEXPECTED_OWNER ?
+                               "unexpected_owner " : ""));
+               return NT_STATUS_IMAGE_CERT_REVOKED;
+       }
+
+       return NT_STATUS_OK;
+}
+
+struct tstream_tls_connect_state {
+       struct tstream_context *tls_stream;
+};
+
+struct tevent_req *_tstream_tls_connect_send(TALLOC_CTX *mem_ctx,
+                                            struct tevent_context *ev,
+                                            struct tstream_context *plain_stream,
+                                            struct tstream_tls_params *_tls_params,
+                                            const char *location)
+{
+       struct tevent_req *req;
+       struct tstream_tls_connect_state *state;
+       struct tstream_tls *tlss;
+       NTSTATUS status;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct tstream_tls_connect_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       state->tls_stream = tstream_context_create(state,
+                                                  &tstream_tls_ops,
+                                                  &tlss,
+                                                  struct tstream_tls,
+                                                  location);
+       if (tevent_req_nomem(state->tls_stream, req)) {
+               return tevent_req_post(req, ev);
+       }
+       ZERO_STRUCTP(tlss);
+       talloc_set_destructor(tlss, tstream_tls_destructor);
+       tlss->plain_stream = plain_stream;
+       tlss->is_server = false;
+       tlss->current_ev = ev;
+
+       status = tstream_tls_prepare_gnutls(_tls_params, tlss);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MEMORY)) {
+               tevent_req_oom(req);
+               return tevent_req_post(req, ev);
+       }
+       if (!NT_STATUS_IS_OK(status)) {
                tevent_req_error(req, EINVAL);
                return tevent_req_post(req, ev);
        }
@@ -1313,9 +1589,7 @@ struct tevent_req *_tstream_tls_accept_send(TALLOC_CTX *mem_ctx,
        struct tevent_req *req;
        struct tstream_tls_accept_state *state;
        struct tstream_tls *tlss;
-       const char *error_pos;
-       struct tstream_tls_params_internal *tlsp = NULL;
-       int ret;
+       NTSTATUS status;
 
        req = tevent_req_create(mem_ctx, &state,
                                struct tstream_tls_accept_state);
@@ -1333,70 +1607,20 @@ struct tevent_req *_tstream_tls_accept_send(TALLOC_CTX *mem_ctx,
        }
        ZERO_STRUCTP(tlss);
        talloc_set_destructor(tlss, tstream_tls_destructor);
-
-       /*
-        * Note we need to make sure x509_cred and dh_params
-        * from tstream_tls_params_internal stay alive for
-        * the whole lifetime of this session!
-        *
-        * See 'man gnutls_credentials_set' and
-        * 'man gnutls_certificate_set_dh_params'.
-        *
-        * Note: here we use talloc_reference() in a way
-        *       that does not expose it to the caller.
-        */
-       tlsp = talloc_reference(tlss, _tlsp->internal);
-       if (tevent_req_nomem(tlsp, req)) {
-               return tevent_req_post(req, ev);
-       }
-
        tlss->plain_stream = plain_stream;
-
+       tlss->is_server = true;
        tlss->current_ev = ev;
-       tlss->retry_im = tevent_create_immediate(tlss);
-       if (tevent_req_nomem(tlss->retry_im, req)) {
-               return tevent_req_post(req, ev);
-       }
 
-       ret = gnutls_init(&tlss->tls_session, GNUTLS_SERVER);
-       if (ret != GNUTLS_E_SUCCESS) {
-               DEBUG(0,("TLS %s - %s\n", __location__, gnutls_strerror(ret)));
-               tevent_req_error(req, EINVAL);
+       status = tstream_tls_prepare_gnutls(_tlsp, tlss);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_NO_MEMORY)) {
+               tevent_req_oom(req);
                return tevent_req_post(req, ev);
        }
-
-       ret = gnutls_set_default_priority(tlss->tls_session);
-       if (ret != GNUTLS_E_SUCCESS) {
-               DBG_ERR("TLS %s - %s. Failed to set default priorities\n",
-                       __location__, gnutls_strerror(ret));
+       if (!NT_STATUS_IS_OK(status)) {
                tevent_req_error(req, EINVAL);
                return tevent_req_post(req, ev);
        }
 
-       if (strlen(tlsp->tls_priority) > 0) {
-               ret = gnutls_priority_set_direct(tlss->tls_session,
-                                                tlsp->tls_priority,
-                                                &error_pos);
-               if (ret != GNUTLS_E_SUCCESS) {
-                       DEBUG(0,("TLS %s - %s.  Check 'tls priority' option at '%s'\n",
-                                __location__, gnutls_strerror(ret), error_pos));
-                       tevent_req_error(req, EINVAL);
-                       return tevent_req_post(req, ev);
-               }
-       }
-
-       ret = gnutls_credentials_set(tlss->tls_session, GNUTLS_CRD_CERTIFICATE,
-                                    tlsp->x509_cred);
-       if (ret != GNUTLS_E_SUCCESS) {
-               DEBUG(0,("TLS %s - %s\n", __location__, gnutls_strerror(ret)));
-               tevent_req_error(req, EINVAL);
-               return tevent_req_post(req, ev);
-       }
-
-       gnutls_certificate_server_set_request(tlss->tls_session,
-                                             GNUTLS_CERT_REQUEST);
-       gnutls_dh_set_prime_bits(tlss->tls_session, DH_BITS);
-
        gnutls_transport_set_ptr(tlss->tls_session,
                                 (gnutls_transport_ptr_t)state->tls_stream);
        gnutls_transport_set_pull_function(tlss->tls_session,
@@ -1419,6 +1643,7 @@ static void tstream_tls_retry_handshake(struct tstream_context *stream)
                tstream_context_data(stream,
                struct tstream_tls);
        struct tevent_req *req = tlss->handshake.req;
+       NTSTATUS status;
        int ret;
 
        if (tlss->error != 0) {
@@ -1447,72 +1672,23 @@ static void tstream_tls_retry_handshake(struct tstream_context *stream)
                return;
        }
 
-       if (tlss->verify_peer >= TLS_VERIFY_PEER_CA_ONLY) {
-               unsigned int status = UINT32_MAX;
-               bool ip = true;
-               const char *hostname = NULL;
-
-               if (tlss->peer_name != NULL) {
-                       ip = is_ipaddress(tlss->peer_name);
-               }
-
-               if (!ip) {
-                       hostname = tlss->peer_name;
-               }
-
-               if (tlss->verify_peer == TLS_VERIFY_PEER_CA_ONLY) {
-                       hostname = NULL;
-               }
-
-               if (tlss->verify_peer >= TLS_VERIFY_PEER_CA_AND_NAME) {
-                       if (hostname == NULL) {
-                               DEBUG(1,("TLS %s - no hostname available for "
-                                        "verify_peer[%s] and peer_name[%s]\n",
-                                        __location__,
-                                        tls_verify_peer_string(tlss->verify_peer),
-                                        tlss->peer_name));
-                               tlss->error = EINVAL;
-                               tevent_req_error(req, tlss->error);
-                               return;
-                       }
-               }
-
-               ret = gnutls_certificate_verify_peers3(tlss->tls_session,
-                                                      hostname,
-                                                      &status);
-               if (ret != GNUTLS_E_SUCCESS) {
-                       DEBUG(1,("TLS %s - %s\n", __location__, gnutls_strerror(ret)));
-                       tlss->error = EIO;
-                       tevent_req_error(req, tlss->error);
-                       return;
-               }
+       status = tstream_tls_verify_peer(tlss);
+       if (NT_STATUS_EQUAL(status, NT_STATUS_IMAGE_CERT_REVOKED)) {
+               tlss->error = EINVAL;
+               tevent_req_error(req, tlss->error);
+               return;
+       }
+       if (!NT_STATUS_IS_OK(status)) {
+               tlss->error = EIO;
+               tevent_req_error(req, tlss->error);
+               return;
+       }
 
-               if (status != 0) {
-                       DEBUG(1,("TLS %s - check failed for "
-                                "verify_peer[%s] and peer_name[%s] "
-                                "status 0x%x (%s%s%s%s%s%s%s%s)\n",
-                                __location__,
-                                tls_verify_peer_string(tlss->verify_peer),
-                                tlss->peer_name,
-                                status,
-                                status & GNUTLS_CERT_INVALID ? "invalid " : "",
-                                status & GNUTLS_CERT_REVOKED ? "revoked " : "",
-                                status & GNUTLS_CERT_SIGNER_NOT_FOUND ?
-                                       "signer_not_found " : "",
-                                status & GNUTLS_CERT_SIGNER_NOT_CA ?
-                                       "signer_not_ca " : "",
-                                status & GNUTLS_CERT_INSECURE_ALGORITHM ?
-                                       "insecure_algorithm " : "",
-                                status & GNUTLS_CERT_NOT_ACTIVATED ?
-                                       "not_activated " : "",
-                                status & GNUTLS_CERT_EXPIRED ?
-                                       "expired " : "",
-                                status & GNUTLS_CERT_UNEXPECTED_OWNER ?
-                                       "unexpected_owner " : ""));
-                       tlss->error = EINVAL;
-                       tevent_req_error(req, tlss->error);
-                       return;
-               }
+       status = tstream_tls_setup_channel_bindings(tlss);
+       if (!NT_STATUS_IS_OK(status)) {
+               tlss->error = EIO;
+               tevent_req_error(req, tlss->error);
+               return;
        }
 
        if (tlss->push.subreq != NULL || tlss->pull.subreq != NULL) {