Unbreak with gnutls>=3.

This commit is contained in:
ajacoutot 2012-07-09 18:38:45 +00:00
parent 8144deee1a
commit 4f785e279f

View File

@ -0,0 +1,33 @@
$OpenBSD: patch-src_import_c,v 1.1 2012/07/09 18:38:45 ajacoutot Exp $
Fix build with gnutls>=3.
--- src/import.c.orig Mon Jul 9 20:36:05 2012
+++ src/import.c Mon Jul 9 20:35:44 2012
@@ -695,7 +695,7 @@ gint import_pkcs12 (guchar *file_contents, gsize file_
// After having all the parts unencrypted, we import all certificates first.
for (i=0; i<n_bags; i++) {
- gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
+ gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
for (i=0; i < num_elements_in_bag; i++) {
@@ -722,7 +722,7 @@ gint import_pkcs12 (guchar *file_contents, gsize file_
// Then, we import all PKCS8 private keys.
for (i=0; i<n_bags; i++) {
- gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
+ gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
for (i=0; i < num_elements_in_bag; i++) {
@@ -796,7 +796,7 @@ gint import_pkcs12 (guchar *file_contents, gsize file_
// Then we import the CRLs
for (i=0; i<n_bags; i++) {
- gnutls_pkcs12_bag * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
+ gnutls_pkcs12_bag_t * pkcs12_bag = g_array_index (pkcs_bag_array, gnutls_pkcs12_bag_t *, i);
guint num_elements_in_bag = gnutls_pkcs12_bag_get_count (*pkcs12_bag);
for (i=0; i < num_elements_in_bag; i++) {