Attachment 1445372 Details for Bug 1577572 – Work around incompatible GnuTLS ABI change.

[patch] Work around incompatible GnuTLS ABI change.

0001-Cope-with-gnutls_pkcs11_obj_get_info-ABI-change-in-3.patch (text/plain), 2.21 KB, created by David Woodhouse on 2018-05-29 12:03:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2018-05-29 12:03:33 UTC

Size: 2.21 KB

patch

obsolete

>From 9362354f48fc7d5e8e79da72630b36d9e789a945 Mon Sep 17 00:00:00 2001
>From: David Woodhouse <dwmw2@infradead.org>
>Date: Tue, 29 May 2018 12:55:31 +0100
>Subject: [PATCH] Cope with gnutls_pkcs11_obj_get_info() ABI change in 3.6.0
>
>Since 3.6.0, gnutls_pkcs11_obj_get_info() no longer includes the NUL
>terminator in the output_size it returns. This was causing fields to
>be truncated by one character.
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1577572
>
>Signed-off-by: David Woodhouse <dwmw2@infradead.org>
>---
> gnutls.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
>diff --git a/gnutls.c b/gnutls.c
>index baf1cd1..49dad28 100644
>--- a/gnutls.c
>+++ b/gnutls.c
>@@ -1174,7 +1174,8 @@ static int load_certificate(struct openconnect_info *vpninfo)
> 				s = sizeof(token->label) + 1;
> 				if (!gnutls_pkcs11_obj_get_info(crt, GNUTLS_PKCS11_OBJ_TOKEN_LABEL,
> 								buf, &s)) {
>-					s--;
>+					if (!gtls_ver(3,6,0))
>+						s--;
> 					memcpy(token->label, buf, s);
> 					memset(token->label + s, ' ',
> 					       sizeof(token->label) - s);
>@@ -1184,7 +1185,8 @@ static int load_certificate(struct openconnect_info *vpninfo)
> 				s = sizeof(token->manufacturerID) + 1;
> 				if (!gnutls_pkcs11_obj_get_info(crt, GNUTLS_PKCS11_OBJ_TOKEN_MANUFACTURER,
> 								buf, &s)) {
>-					s--;
>+					if (!gtls_ver(3,6,0))
>+						s--;
> 					memcpy(token->manufacturerID, buf, s);
> 					memset(token->manufacturerID + s, ' ',
> 					       sizeof(token->manufacturerID) - s);
>@@ -1194,7 +1196,8 @@ static int load_certificate(struct openconnect_info *vpninfo)
> 				s = sizeof(token->model) + 1;
> 				if (!gnutls_pkcs11_obj_get_info(crt, GNUTLS_PKCS11_OBJ_TOKEN_MODEL,
> 								buf, &s)) {
>-					s--;
>+					if (!gtls_ver(3,6,0))
>+						s--;
> 					memcpy(token->model, buf, s);
> 					memset(token->model + s, ' ',
> 					       sizeof(token->model) - s);
>@@ -1204,7 +1207,8 @@ static int load_certificate(struct openconnect_info *vpninfo)
> 				s = sizeof(token->serialNumber) + 1;
> 				if (!gnutls_pkcs11_obj_get_info(crt, GNUTLS_PKCS11_OBJ_TOKEN_SERIAL,
> 								buf, &s)) {
>-					s--;
>+					if (!gtls_ver(3,6,0))
>+						s--;
> 					memcpy(token->serialNumber, buf, s);
> 					memset(token->serialNumber + s, ' ',
> 					       sizeof(token->serialNumber) - s);
>-- 
>2.7.4
>

Actions: View | Diff

Attachments on bug 1577572: 1436073 | 1436219 | 1436638 | 1436640 | 1437472 | 1437774 | 1438050 | 1438051 | 1438052 | 1438989 | 1438990 | 1442008 | 1443406 | 1445372