Remove support for OpenPGP certificates in our TLS client and server
authorAndrew Bartlett <abartlet@samba.org>
Sun, 19 Jul 2015 22:37:21 +0000 (10:37 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 20 Jul 2015 01:08:26 +0000 (03:08 +0200)
We do not provide parameters to configure these, and OpenPGP for TLS (RFC 6091) is not used in AD

Pair-programmed-with: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
source4/lib/tls/tls_tstream.c

index 113e03ab9dcf0a4af0f3c6a2cdef9d6bdb602c7d..9dea4f23c77a0517d2dd3582d1870cbee8b8d29b 100644 (file)
@@ -1009,8 +1009,6 @@ struct tevent_req *_tstream_tls_connect_send(TALLOC_CTX *mem_ctx,
                return tevent_req_post(req, ev);
        }
 
-       gnutls_priority_set_direct(tlss->tls_session, "NORMAL:+CTYPE-OPENPGP", NULL);
-
        ret = gnutls_credentials_set(tlss->tls_session,
                                     GNUTLS_CRD_CERTIFICATE,
                                     tls_params->x509_cred);