From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 28 Jan 2020 13:58:27 +0000 (+0100)
Subject: pkcs11: Avoid naming conflict with method parameter
X-Git-Tag: 5.8.3dr1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11479736610247c2610fc832acc3d31c40f8595f;p=thirdparty%2Fstrongswan.git

pkcs11: Avoid naming conflict with method parameter
---

diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_creds.c b/src/libstrongswan/plugins/pkcs11/pkcs11_creds.c
index b1575540df..76d69d5cb4 100644
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_creds.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_creds.c
@@ -308,10 +308,10 @@ certificate_t *pkcs11_creds_load(certificate_type_t type, va_list args)
 	while (enumerator->enumerate(enumerator, &p11, &current))
 	{
 		CK_OBJECT_CLASS class = CKO_CERTIFICATE;
-		CK_CERTIFICATE_TYPE type = CKC_X_509;
+		CK_CERTIFICATE_TYPE ck_type = CKC_X_509;
 		CK_ATTRIBUTE tmpl[] = {
 			{CKA_CLASS, &class, sizeof(class)},
-			{CKA_CERTIFICATE_TYPE, &type, sizeof(type)},
+			{CKA_CERTIFICATE_TYPE, &ck_type, sizeof(ck_type)},
 			{CKA_ID, keyid.ptr, keyid.len},
 		};
 		CK_ATTRIBUTE attr[] = {