3ab1b8443e
- Bump PORTREVISION on all ports that depend on security/gnutls and adjust all ports that depend on security/gnutls3 - Update mail/anubis to version 4.2 which supports gnutls 3.x - Update mail/libvmime to a development snapshot (recommended by upstream developers) PR: 191274 Exp-run by: antoine Approved by: portmgr (antoine)
35 lines
859 B
C
35 lines
859 B
C
--- src/gnutls.c.orig
|
|
+++ src/gnutls.c
|
|
@@ -18,7 +18,6 @@
|
|
|
|
#include <glib.h>
|
|
|
|
-#include <gcrypt.h>
|
|
#include <gnutls/gnutls.h>
|
|
#include <gnutls/x509.h>
|
|
|
|
@@ -47,11 +46,11 @@
|
|
static gboolean
|
|
verify_certificate (gnutls_session session, const char *hostname, GError **err)
|
|
{
|
|
- int status;
|
|
+ int res, status;
|
|
|
|
- status = gnutls_certificate_verify_peers (session);
|
|
+ res = gnutls_certificate_verify_peers2 (session, &status);
|
|
|
|
- if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) {
|
|
+ if (res < 0 || status == GNUTLS_E_NO_CERTIFICATE_FOUND) {
|
|
g_set_error (err, SSL_ERROR,
|
|
SSL_ERROR_CERTIFICATE,
|
|
"No SSL certificate was sent.");
|
|
@@ -452,9 +451,6 @@
|
|
static void
|
|
_gnutls_init (void)
|
|
{
|
|
- /* to disallow usage of the blocking /dev/random */
|
|
- gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
|
|
-
|
|
gnutls_global_init ();
|
|
gnutls_inited = TRUE;
|
|
}
|