32 lines
1.0 KiB
Plaintext
32 lines
1.0 KiB
Plaintext
$OpenBSD: patch-wmbiff_gnutls-common_c,v 1.3 2012/07/09 09:34:26 ajacoutot Exp $
|
|
--- wmbiff/gnutls-common.c.orig Mon Jul 9 11:11:19 2012
|
|
+++ wmbiff/gnutls-common.c Mon Jul 9 11:30:10 2012
|
|
@@ -4,7 +4,6 @@
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <gnutls/gnutls.h>
|
|
-#include <gnutls/extra.h>
|
|
#include <gnutls/x509.h>
|
|
#include <gnutls/openpgp.h>
|
|
#include <time.h>
|
|
@@ -335,8 +334,8 @@ void print_openpgp_info(gnutls_session session, const
|
|
void print_cert_vrfy(gnutls_session session)
|
|
{
|
|
|
|
- int status;
|
|
- status = gnutls_certificate_verify_peers(session);
|
|
+ int status, verify_ret;
|
|
+ verify_ret = gnutls_certificate_verify_peers2(session, &status);
|
|
printf("\n");
|
|
|
|
if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) {
|
|
@@ -637,8 +636,6 @@ void parse_comp(char **comp, int ncomp, int *comp_prio
|
|
comp_priority[j++] = GNUTLS_COMP_NULL;
|
|
if (strncasecmp(comp[i], "ZLI", 3) == 0)
|
|
comp_priority[j++] = GNUTLS_COMP_ZLIB;
|
|
- if (strncasecmp(comp[i], "LZO", 3) == 0)
|
|
- comp_priority[j++] = GNUTLS_COMP_LZO;
|
|
}
|
|
comp_priority[j] = 0;
|
|
}
|