aboutsummaryrefslogtreecommitdiff
path: root/pkcs11.c
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2009-01-27 19:32:46 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2009-01-27 19:32:46 +0000
commitb110c9c43940f7e314bcf9be02f6fdc22c81c560 (patch)
treeff02bda67d63b83b1bb6f69a48e68bd2dd4f1a5e /pkcs11.c
parentFixed some issues with C++ style comments that leaked into the code. (diff)
downloadopenvpn-b110c9c43940f7e314bcf9be02f6fdc22c81c560.tar.xz
Fixed some compile-time warnings.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3900 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to '')
-rw-r--r--pkcs11.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkcs11.c b/pkcs11.c
index b67a5d5..97ee7a6 100644
--- a/pkcs11.c
+++ b/pkcs11.c
@@ -148,6 +148,8 @@ _pkcs11_openvpn_log (
va_list args
) {
char Buffer[10*1024];
+
+ (void)global_data;
vsnprintf (Buffer, sizeof (Buffer), szFormat, args);
Buffer[sizeof (Buffer)-1] = 0;
@@ -441,7 +443,7 @@ pkcs11_management_id_get (
#endif
pkcs11h_certificate_t certificate = NULL;
CK_RV rv = CKR_OK;
- char *certificate_blob = NULL;
+ unsigned char *certificate_blob = NULL;
size_t certificate_blob_size = 0;
size_t max;
char *internal_id = NULL;
@@ -541,7 +543,7 @@ pkcs11_management_id_get (
goto cleanup;
}
- if ((certificate_blob = (char *)malloc (certificate_blob_size)) == NULL) {
+ if ((certificate_blob = (unsigned char *)malloc (certificate_blob_size)) == NULL) {
msg (M_FATAL, "PKCS#11: Cannot allocate memory");
goto cleanup;
}