Attachment 74369 Details for Bug 60434 – Don't use struct asn1_node_data

[patch] Don't use struct asn1_node_data

Dont-use-struct-asn1nodedata.patch (text/plain), 1.22 KB, created by Stef Walter on 2013-02-07 18:07:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stef Walter

Created: 2013-02-07 18:07:18 UTC

Size: 1.22 KB

patch

obsolete

>From 23a3b68492749683bd3d3c5afecbea3f2c7a98ca Mon Sep 17 00:00:00 2001
>From: Stef Walter <stefw@gnome.org>
>Date: Thu, 7 Feb 2013 19:06:24 +0100
>Subject: [PATCH] Don't use struct asn1_node_data
>
> * It's different between versions, and has caused a number
>   of build failures.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=60434
>---
> common/asn1.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/common/asn1.c b/common/asn1.c
>index 3df56d9..d1cb7d5 100644
>--- a/common/asn1.c
>+++ b/common/asn1.c
>@@ -165,11 +165,11 @@ p11_asn1_encode (node_asn *asn,
>                  size_t *der_len)
> {
> 	char message[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
>-	struct asn1_data_node data = { NULL, };
> 	unsigned char *der;
> 	int len;
> 	int ret;
> 
>+	return_val_if_fail (asn != NULL, NULL);
> 	return_val_if_fail (der_len != NULL, NULL);
> 
> 	len = 0;
>@@ -184,9 +184,8 @@ p11_asn1_encode (node_asn *asn,
> 	}
> 
> 	if (ret != ASN1_SUCCESS) {
>-		asn1_read_node_value (asn, &data);
>-		p11_debug_precond ("failed to encode %s: %s\n",
>-		                   data.name ? data.name : "(unknown)", message);
>+		p11_debug_precond ("failed to encode %s %s\n",
>+		                   asn->name ? asn->name : "(unknown)", message);
> 		return NULL;
> 	}
> 
>-- 
>1.8.1

Actions: View | Splinter Review

Attachments on bug 60434: 74368 | 74369 | 74646

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.