[pkg-opensc-commit] [pkcs11-helper] 29/253: Free pkcs11.h C++ support

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository pkcs11-helper.

commit 1ce0ce827225806a20e9f8ba48e79cea939d905b
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Fri Dec 8 18:40:23 2006 +0000

    Free pkcs11.h C++ support
---
 include/pkcs11-helper-1.0/pkcs11.h | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/include/pkcs11-helper-1.0/pkcs11.h b/include/pkcs11-helper-1.0/pkcs11.h
index 3edd7cb..8494e2a 100644
--- a/include/pkcs11-helper-1.0/pkcs11.h
+++ b/include/pkcs11-helper-1.0/pkcs11.h
@@ -48,6 +48,10 @@
 #ifndef PKCS11_H
 #define PKCS11_H 1
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #ifndef CRYPTOKI_COMPAT
 #define CRYPTOKI_COMPAT 1
 #endif
@@ -664,11 +668,11 @@ _CK_DECLARE_FUNCTION (C_Logout, (ck_session_handle_t session));
 
 _CK_DECLARE_FUNCTION (C_CreateObject,
 		      (ck_session_handle_t session,
-		       struct ck_attribute *template,
+		       struct ck_attribute *_template,
 		       unsigned long count, ck_object_handle_t *object));
 _CK_DECLARE_FUNCTION (C_CopyObject,
 		      (ck_session_handle_t session, ck_object_handle_t object,
-		       struct ck_attribute *template, unsigned long count,
+		       struct ck_attribute *_template, unsigned long count,
 		       ck_object_handle_t *new_object));
 _CK_DECLARE_FUNCTION (C_DestroyObject,
 		      (ck_session_handle_t session,
@@ -680,16 +684,16 @@ _CK_DECLARE_FUNCTION (C_GetObjectSize,
 _CK_DECLARE_FUNCTION (C_GetAttributeValue,
 		      (ck_session_handle_t session,
 		       ck_object_handle_t object,
-		       struct ck_attribute *template,
+		       struct ck_attribute *_template,
 		       unsigned long count));
 _CK_DECLARE_FUNCTION (C_SetAttributeValue,
 		      (ck_session_handle_t session,
 		       ck_object_handle_t object,
-		       struct ck_attribute *template,
+		       struct ck_attribute *_template,
 		       unsigned long count));
 _CK_DECLARE_FUNCTION (C_FindObjectsInit,
 		      (ck_session_handle_t session,
-		       struct ck_attribute *template,
+		       struct ck_attribute *_template,
 		       unsigned long count));
 _CK_DECLARE_FUNCTION (C_FindObjects,
 		      (ck_session_handle_t session,
@@ -834,7 +838,7 @@ _CK_DECLARE_FUNCTION (C_DecryptVerifyUpdate,
 _CK_DECLARE_FUNCTION (C_GenerateKey,
 		      (ck_session_handle_t session,
 		       struct ck_mechanism *mechanism,
-		       struct ck_attribute *template,
+		       struct ck_attribute *_template,
 		       unsigned long count,
 		       ck_object_handle_t *key));
 _CK_DECLARE_FUNCTION (C_GenerateKeyPair,
@@ -859,14 +863,14 @@ _CK_DECLARE_FUNCTION (C_UnwrapKey,
 		       ck_object_handle_t unwrapping_key,
 		       unsigned char *wrapped_key,
 		       unsigned long wrapped_key_len,
-		       struct ck_attribute *template,
+		       struct ck_attribute *_template,
 		       unsigned long attribute_count,
 		       ck_object_handle_t *key));
 _CK_DECLARE_FUNCTION (C_DeriveKey,
 		      (ck_session_handle_t session,
 		       struct ck_mechanism *mechanism,
 		       ck_object_handle_t base_key,
-		       struct ck_attribute *template,
+		       struct ck_attribute *_template,
 		       unsigned long attribute_count,
 		       ck_object_handle_t *key));
 
@@ -1213,4 +1217,8 @@ typedef struct ck_c_initialize_args *CK_C_INITIALIZE_ARGS_PTR;
 #pragma pack(pop, cryptoki)
 #endif	/* !CRYPTOKI_COMPAT */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* PKCS11_H */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git