[pkg-opensc-commit] [pkcs11-helper] 32/253: signed to unsigned cleanups
Eric Dorland
eric at moszumanska.debian.org
Fri Jan 6 23:39:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository pkcs11-helper.
commit e10cd4917ed367273484bbf7ae8b3f5ca14fdfbc
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date: Sat Dec 9 11:02:14 2006 +0000
signed to unsigned cleanups
---
include/pkcs11-helper-1.0/pkcs11h-certificate.h | 4 +-
include/pkcs11-helper-1.0/pkcs11h-core.h | 4 +-
include/pkcs11-helper-1.0/pkcs11h-token.h | 2 +-
lib/_pkcs11h-core.h | 4 +-
lib/pkcs11h-certificate.c | 68 ++++++++++++-------------
lib/pkcs11h-core.c | 12 ++---
lib/pkcs11h-data.c | 18 +++----
lib/pkcs11h-openssl.c | 4 +-
lib/pkcs11h-serialization.c | 6 +--
lib/pkcs11h-session.c | 26 +++++-----
lib/pkcs11h-slotevent.c | 2 +-
lib/pkcs11h-token.c | 19 +++----
12 files changed, 85 insertions(+), 84 deletions(-)
diff --git a/include/pkcs11-helper-1.0/pkcs11h-certificate.h b/include/pkcs11-helper-1.0/pkcs11h-certificate.h
index 5cf83b2..d2f427e 100644
--- a/include/pkcs11-helper-1.0/pkcs11h-certificate.h
+++ b/include/pkcs11-helper-1.0/pkcs11h-certificate.h
@@ -502,7 +502,7 @@ pkcs11h_certificate_freeCertificateIdList (
CK_RV
pkcs11h_certificate_enumTokenCertificateIds (
IN const pkcs11h_token_id_t token_id,
- IN const int method,
+ IN const unsigned method,
IN void * const user_data,
IN const unsigned mask_prompt,
OUT pkcs11h_certificate_id_list_t * const p_cert_id_issuers_list,
@@ -523,7 +523,7 @@ pkcs11h_certificate_enumTokenCertificateIds (
*/
CK_RV
pkcs11h_certificate_enumCertificateIds (
- IN const int method,
+ IN const unsigned method,
IN void * const user_data,
IN const unsigned mask_prompt,
OUT pkcs11h_certificate_id_list_t * const p_cert_id_issuers_list,
diff --git a/include/pkcs11-helper-1.0/pkcs11h-core.h b/include/pkcs11-helper-1.0/pkcs11h-core.h
index 39e2027..a616e6c 100644
--- a/include/pkcs11-helper-1.0/pkcs11h-core.h
+++ b/include/pkcs11-helper-1.0/pkcs11h-core.h
@@ -482,8 +482,8 @@ pkcs11h_addProvider (
IN const char * const provider_location,
IN const PKCS11H_BOOL allow_protected_auth,
IN const unsigned mask_private_mode,
- IN const int slot_event_method,
- IN const int slot_poll_interval,
+ IN const unsigned slot_event_method,
+ IN const unsigned slot_poll_interval,
IN const PKCS11H_BOOL cert_is_private
);
diff --git a/include/pkcs11-helper-1.0/pkcs11h-token.h b/include/pkcs11-helper-1.0/pkcs11h-token.h
index 13c2cc7..d6f79e2 100644
--- a/include/pkcs11-helper-1.0/pkcs11h-token.h
+++ b/include/pkcs11-helper-1.0/pkcs11h-token.h
@@ -164,7 +164,7 @@ pkcs11h_token_freeTokenIdList (
*/
CK_RV
pkcs11h_token_enumTokenIds (
- IN const int method,
+ IN const unsigned method,
OUT pkcs11h_token_id_list_t * const p_token_id_list
);
diff --git a/lib/_pkcs11h-core.h b/lib/_pkcs11h-core.h
index 15f37d6..1531e0b 100644
--- a/lib/_pkcs11h-core.h
+++ b/lib/_pkcs11h-core.h
@@ -121,8 +121,8 @@ struct pkcs11h_provider_s {
PKCS11H_BOOL cert_is_private;
unsigned mask_private_mode;
unsigned mask_decrypt_mode;
- int slot_event_method;
- int slot_poll_interval;
+ unsigned slot_event_method;
+ unsigned slot_poll_interval;
#if defined(ENABLE_PKCS11H_SLOTEVENT)
pkcs11h_thread_t slotevent_thread;
diff --git a/lib/pkcs11h-certificate.c b/lib/pkcs11h-certificate.c
index 091726f..13f7749 100644
--- a/lib/pkcs11h-certificate.c
+++ b/lib/pkcs11h-certificate.c
@@ -201,7 +201,7 @@ _pkcs11h_certificate_newCertificateId (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_certificate_newCertificateId return rv=%ld-'%s', *p_certificate_id=%p",
+ "PKCS#11: _pkcs11h_certificate_newCertificateId return rv=%lu-'%s', *p_certificate_id=%p",
rv,
pkcs11h_getMessage (rv),
(void *)*p_certificate_id
@@ -308,7 +308,7 @@ __pkcs11h_certificate_loadCertificate (
if (rv != CKR_OK) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Cannot get object attribute for provider '%s' object %ld rv=%ld-'%s'",
+ "PKCS#11: Cannot get object attribute for provider '%s' object %ld rv=%lu-'%s'",
certificate->session->provider->manufacturerID,
objects[i],
rv,
@@ -353,7 +353,7 @@ __pkcs11h_certificate_loadCertificate (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: __pkcs11h_certificate_loadCertificate return rv=%ld-'%s'",
+ "PKCS#11: __pkcs11h_certificate_loadCertificate return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -559,7 +559,7 @@ __pkcs11h_certificate_getKeyAttributes (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: __pkcs11h_certificate_getKeyAttributes return rv=%ld-'%s'",
+ "PKCS#11: __pkcs11h_certificate_getKeyAttributes return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -602,7 +602,7 @@ _pkcs11h_certificate_validateSession (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_certificate_validateSession return rv=%ld-'%s'",
+ "PKCS#11: _pkcs11h_certificate_validateSession return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -757,7 +757,7 @@ _pkcs11h_certificate_resetSession (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_certificate_resetSession return rv=%ld-'%s'",
+ "PKCS#11: _pkcs11h_certificate_resetSession return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -989,7 +989,7 @@ __pkcs11h_certificate_doPrivateOperation (
if (!login_retry) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Private key operation failed rv=%ld-'%s'",
+ "PKCS#11: Private key operation failed rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -1013,7 +1013,7 @@ __pkcs11h_certificate_doPrivateOperation (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: __pkcs11h_certificate_doPrivateOperation return rv=%ld-'%s', *p_target_size=%u",
+ "PKCS#11: __pkcs11h_certificate_doPrivateOperation return rv=%lu-'%s', *p_target_size=%u",
rv,
pkcs11h_getMessage (rv),
*p_target_size
@@ -1115,7 +1115,7 @@ pkcs11h_certificate_duplicateCertificateId (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_duplicateCertificateId return rv=%ld-'%s', *to=%p",
+ "PKCS#11: pkcs11h_certificate_duplicateCertificateId return rv=%lu-'%s', *to=%p",
rv,
pkcs11h_getMessage (rv),
(void *)*to
@@ -1158,7 +1158,7 @@ pkcs11h_certificate_setCertificateIdCertificateBlob (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_setCertificateIdCertificateBlob return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_certificate_setCertificateIdCertificateBlob return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -1294,7 +1294,7 @@ pkcs11h_certificate_sign (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_sign return rv=%ld-'%s', *p_target_size=%u",
+ "PKCS#11: pkcs11h_certificate_sign return rv=%lu-'%s', *p_target_size=%u",
rv,
pkcs11h_getMessage (rv),
*p_target_size
@@ -1350,7 +1350,7 @@ pkcs11h_certificate_signRecover (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_signRecover return rv=%ld-'%s', *p_target_size=%u",
+ "PKCS#11: pkcs11h_certificate_signRecover return rv=%lu-'%s', *p_target_size=%u",
rv,
pkcs11h_getMessage (rv),
*p_target_size
@@ -1406,7 +1406,7 @@ pkcs11h_certificate_decrypt (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_decrypt return rv=%ld-'%s', *p_target_size=%u",
+ "PKCS#11: pkcs11h_decrypt return rv=%lu-'%s', *p_target_size=%u",
rv,
pkcs11h_getMessage (rv),
*p_target_size
@@ -1462,7 +1462,7 @@ pkcs11h_certificate_unwrap (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_unwrap return rv=%ld-'%s', *p_target_size=%u",
+ "PKCS#11: pkcs11h_unwrap return rv=%lu-'%s', *p_target_size=%u",
rv,
pkcs11h_getMessage (rv),
*p_target_size
@@ -1572,7 +1572,7 @@ pkcs11h_certificate_signAny (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_signAny return rv=%ld-'%s', *p_target_size=%u",
+ "PKCS#11: pkcs11h_certificate_signAny return rv=%lu-'%s', *p_target_size=%u",
rv,
pkcs11h_getMessage (rv),
*p_target_size
@@ -1682,7 +1682,7 @@ pkcs11h_certificate_decryptAny (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_decryptAny return rv=%ld-'%s', *p_target_size=%u",
+ "PKCS#11: pkcs11h_certificate_decryptAny return rv=%lu-'%s', *p_target_size=%u",
rv,
pkcs11h_getMessage (rv),
*p_target_size
@@ -1753,7 +1753,7 @@ pkcs11h_certificate_create (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_create return rv=%ld-'%s' *p_certificate=%p",
+ "PKCS#11: pkcs11h_certificate_create return rv=%lu-'%s' *p_certificate=%p",
rv,
pkcs11h_getMessage (rv),
(void *)*p_certificate
@@ -1828,7 +1828,7 @@ pkcs11h_certificate_getCertificateId (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_getCertificateId return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_certificate_getCertificateId return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -1945,7 +1945,7 @@ pkcs11h_certificate_getCertificateBlob (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_getCertificateBlob return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_certificate_getCertificateBlob return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -2021,7 +2021,7 @@ pkcs11h_certificate_ensureCertificateAccess (
if (rv != CKR_OK) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Cannot access existing object rv=%ld-'%s'",
+ "PKCS#11: Cannot access existing object rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -2054,7 +2054,7 @@ pkcs11h_certificate_ensureCertificateAccess (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_ensureCertificateAccess return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_certificate_ensureCertificateAccess return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -2129,7 +2129,7 @@ pkcs11h_certificate_ensureKeyAccess (
if (rv != CKR_OK) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Cannot access existing object rv=%ld-'%s'",
+ "PKCS#11: Cannot access existing object rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -2163,7 +2163,7 @@ pkcs11h_certificate_ensureKeyAccess (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_ensureKeyAccess return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_certificate_ensureKeyAccess return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -2314,7 +2314,7 @@ _pkcs11h_certificate_enumSessionCertificates (
if (rv != CKR_OK) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Cannot get object attribute for provider '%s' object %ld rv=%ld-'%s'",
+ "PKCS#11: Cannot get object attribute for provider '%s' object %ld rv=%lu-'%s'",
session->provider->manufacturerID,
objects[i],
rv,
@@ -2366,7 +2366,7 @@ _pkcs11h_certificate_enumSessionCertificates (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_certificate_enumSessionCertificates return rv=%ld-'%s'",
+ "PKCS#11: _pkcs11h_certificate_enumSessionCertificates return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -2542,7 +2542,7 @@ __pkcs11h_certificate_splitCertificateIdList (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: __pkcs11h_certificate_splitCertificateIdList return rv=%ld-'%s'",
+ "PKCS#11: __pkcs11h_certificate_splitCertificateIdList return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -2587,7 +2587,7 @@ pkcs11h_certificate_freeCertificateIdList (
CK_RV
pkcs11h_certificate_enumTokenCertificateIds (
IN const pkcs11h_token_id_t token_id,
- IN const int method,
+ IN const unsigned method,
IN void * const user_data,
IN const unsigned mask_prompt,
OUT pkcs11h_certificate_id_list_t * const p_cert_id_issuers_list,
@@ -2608,7 +2608,7 @@ pkcs11h_certificate_enumTokenCertificateIds (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_enumTokenCertificateIds entry token_id=%p, method=%d, user_data=%p, mask_prompt=%08x, p_cert_id_issuers_list=%p, p_cert_id_end_list=%p",
+ "PKCS#11: pkcs11h_certificate_enumTokenCertificateIds entry token_id=%p, method=%u, user_data=%p, mask_prompt=%08x, p_cert_id_issuers_list=%p, p_cert_id_end_list=%p",
(void *)token_id,
method,
user_data,
@@ -2669,7 +2669,7 @@ pkcs11h_certificate_enumTokenCertificateIds (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_enumTokenCertificateIds return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_certificate_enumTokenCertificateIds return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -2679,7 +2679,7 @@ pkcs11h_certificate_enumTokenCertificateIds (
CK_RV
pkcs11h_certificate_enumCertificateIds (
- IN const int method,
+ IN const unsigned method,
IN void * const user_data,
IN const unsigned mask_prompt,
OUT pkcs11h_certificate_id_list_t * const p_cert_id_issuers_list,
@@ -2701,7 +2701,7 @@ pkcs11h_certificate_enumCertificateIds (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_enumCertificateIds entry method=%d, mask_prompt=%08x, p_cert_id_issuers_list=%p, p_cert_id_end_list=%p",
+ "PKCS#11: pkcs11h_certificate_enumCertificateIds entry method=%u, mask_prompt=%08x, p_cert_id_issuers_list=%p, p_cert_id_end_list=%p",
method,
mask_prompt,
(void *)p_cert_id_issuers_list,
@@ -2799,7 +2799,7 @@ pkcs11h_certificate_enumCertificateIds (
if (rv != CKR_OK) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Cannot get token information for provider '%s' slot %ld rv=%ld-'%s'",
+ "PKCS#11: Cannot get token information for provider '%s' slot %ld rv=%lu-'%s'",
current_provider->manufacturerID,
slots[slot_index],
rv,
@@ -2826,7 +2826,7 @@ pkcs11h_certificate_enumCertificateIds (
if (rv != CKR_OK) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Cannot get slot list for provider '%s' rv=%ld-'%s'",
+ "PKCS#11: Cannot get slot list for provider '%s' rv=%lu-'%s'",
current_provider->manufacturerID,
rv,
pkcs11h_getMessage (rv)
@@ -2922,7 +2922,7 @@ pkcs11h_certificate_enumCertificateIds (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_enumCertificateIds return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_certificate_enumCertificateIds return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
diff --git a/lib/pkcs11h-core.c b/lib/pkcs11h-core.c
index 3d683a5..36b1e3a 100644
--- a/lib/pkcs11h-core.c
+++ b/lib/pkcs11h-core.c
@@ -352,7 +352,7 @@ pkcs11h_initialize (void) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_initialize return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_initialize return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -607,8 +607,8 @@ pkcs11h_addProvider (
IN const char * const provider_location,
IN const PKCS11H_BOOL allow_protected_auth,
IN const unsigned mask_private_mode,
- IN const int slot_event_method,
- IN const int slot_poll_interval,
+ IN const unsigned slot_event_method,
+ IN const unsigned slot_poll_interval,
IN const PKCS11H_BOOL cert_is_private
) {
#if defined(ENABLE_PKCS11H_THREADING)
@@ -778,7 +778,7 @@ pkcs11h_addProvider (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Provider '%s' added rv=%ld-'%s'",
+ "PKCS#11: Provider '%s' added rv=%lu-'%s'",
reference,
rv,
pkcs11h_getMessage (rv)
@@ -786,7 +786,7 @@ pkcs11h_addProvider (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_addProvider return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_addProvider return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -896,7 +896,7 @@ pkcs11h_removeProvider (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_removeProvider return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_removeProvider return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
diff --git a/lib/pkcs11h-data.c b/lib/pkcs11h-data.c
index fe21ab5..e81c9c7 100644
--- a/lib/pkcs11h-data.c
+++ b/lib/pkcs11h-data.c
@@ -121,7 +121,7 @@ _pkcs11h_data_getObject (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_data_getObject return rv=%ld-'%s', *p_handle=%08lx",
+ "PKCS#11: _pkcs11h_data_getObject return rv=%lu-'%s', *p_handle=%08lx",
rv,
pkcs11h_getMessage (rv),
(unsigned long)*p_handle
@@ -228,7 +228,7 @@ pkcs11h_data_get (
if (!login_retry) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Read data object failed rv=%ld-'%s'",
+ "PKCS#11: Read data object failed rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -278,7 +278,7 @@ pkcs11h_data_get (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_data_get return rv=%ld-'%s', *p_blob_size=%u",
+ "PKCS#11: pkcs11h_data_get return rv=%lu-'%s', *p_blob_size=%u",
rv,
pkcs11h_getMessage (rv),
*p_blob_size
@@ -379,7 +379,7 @@ pkcs11h_data_put (
if (!login_retry) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Write data object failed rv=%ld-'%s'",
+ "PKCS#11: Write data object failed rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -409,7 +409,7 @@ pkcs11h_data_put (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_data_put return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_data_put return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -497,7 +497,7 @@ pkcs11h_data_del (
if (!login_retry) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Remove data object failed rv=%ld-'%s'",
+ "PKCS#11: Remove data object failed rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -527,7 +527,7 @@ pkcs11h_data_del (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_data_del return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_data_del return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -726,7 +726,7 @@ pkcs11h_data_enumDataObjects (
if (!login_retry) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Enumerate data objects failed rv=%ld-'%s'",
+ "PKCS#11: Enumerate data objects failed rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -766,7 +766,7 @@ pkcs11h_data_enumDataObjects (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_data_enumDataObjects return rv=%ld-'%s', *p_data_id_list=%p",
+ "PKCS#11: pkcs11h_data_enumDataObjects return rv=%lu-'%s', *p_data_id_list=%p",
rv,
pkcs11h_getMessage (rv),
(void *)*p_data_id_list
diff --git a/lib/pkcs11h-openssl.c b/lib/pkcs11h-openssl.c
index 459d550..d0ea5b3 100644
--- a/lib/pkcs11h-openssl.c
+++ b/lib/pkcs11h-openssl.c
@@ -259,7 +259,7 @@ _pkcs11h_openssl_dec (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_openssl_dec - return rv=%ld-'%s'",
+ "PKCS#11: _pkcs11h_openssl_dec - return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -435,7 +435,7 @@ _pkcs11h_openssl_sign (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_openssl_sign - return rv=%ld-'%s'",
+ "PKCS#11: _pkcs11h_openssl_sign - return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
diff --git a/lib/pkcs11h-serialization.c b/lib/pkcs11h-serialization.c
index 37afda0..ae7123c 100644
--- a/lib/pkcs11h-serialization.c
+++ b/lib/pkcs11h-serialization.c
@@ -119,7 +119,7 @@ pkcs11h_token_serializeTokenId (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_token_serializeTokenId return rv=%ld-'%s', *max=%u, sz='%s'",
+ "PKCS#11: pkcs11h_token_serializeTokenId return rv=%lu-'%s', *max=%u, sz='%s'",
rv,
pkcs11h_getMessage (rv),
*max,
@@ -321,7 +321,7 @@ pkcs11h_certificate_serializeCertificateId (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_serializeCertificateId return rv=%ld-'%s', *max=%u, sz='%s'",
+ "PKCS#11: pkcs11h_certificate_serializeCertificateId return rv=%lu-'%s', *max=%u, sz='%s'",
rv,
pkcs11h_getMessage (rv),
*max,
@@ -421,7 +421,7 @@ pkcs11h_certificate_deserializeCertificateId (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_certificate_deserializeCertificateId return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_certificate_deserializeCertificateId return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
diff --git a/lib/pkcs11h-session.c b/lib/pkcs11h-session.c
index 911d82e..c7cd555 100644
--- a/lib/pkcs11h-session.c
+++ b/lib/pkcs11h-session.c
@@ -77,7 +77,7 @@ _pkcs11h_session_getSlotList (
PKCS11H_LOG_DEBUG2,
"PKCS#11: _pkcs11h_session_getSlotList entry provider=%p, token_present=%d, pSlotList=%p, pulCount=%p",
(void *)provider,
- token_present,
+ token_present ? 1 : 0,
(void *)pSlotList,
(void *)pulCount
);
@@ -124,7 +124,7 @@ _pkcs11h_session_getSlotList (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_session_getSlotList return rv=%ld-'%s' *pulCount=%ld",
+ "PKCS#11: _pkcs11h_session_getSlotList return rv=%lu-'%s' *pulCount=%ld",
rv,
pkcs11h_getMessage (rv),
*pulCount
@@ -195,7 +195,7 @@ _pkcs11h_session_getObjectAttributes (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_session_getObjectAttributes return rv=%ld-'%s'",
+ "PKCS#11: _pkcs11h_session_getObjectAttributes return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -230,7 +230,7 @@ _pkcs11h_session_freeObjectAttributes (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_session_freeObjectAttributes return rv=%ld-'%s'",
+ "PKCS#11: _pkcs11h_session_freeObjectAttributes return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -375,7 +375,7 @@ _pkcs11h_session_findObjects (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_session_findObjects return rv=%ld-'%s', *p_objects_found=%ld",
+ "PKCS#11: _pkcs11h_session_findObjects return rv=%lu-'%s', *p_objects_found=%ld",
rv,
pkcs11h_getMessage (rv),
*p_objects_found
@@ -505,7 +505,7 @@ _pkcs11h_session_getSessionByTokenId (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_session_getSessionByTokenId return rv=%ld-'%s', *p_session=%p",
+ "PKCS#11: _pkcs11h_session_getSessionByTokenId return rv=%lu-'%s', *p_session=%p",
rv,
pkcs11h_getMessage (rv),
(void *)*p_session
@@ -559,7 +559,7 @@ _pkcs11h_session_release (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_session_release return rv=%ld-'%s'",
+ "PKCS#11: _pkcs11h_session_release return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -675,7 +675,7 @@ _pkcs11h_session_reset (
if (rv != CKR_OK) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Cannot get token information for provider '%s' slot %ld rv=%ld-'%s'",
+ "PKCS#11: Cannot get token information for provider '%s' slot %ld rv=%lu-'%s'",
current_provider->manufacturerID,
slots[slot_index],
rv,
@@ -696,7 +696,7 @@ _pkcs11h_session_reset (
if (rv != CKR_OK) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Cannot get slot list for provider '%s' rv=%ld-'%s'",
+ "PKCS#11: Cannot get slot list for provider '%s' rv=%lu-'%s'",
current_provider->manufacturerID,
rv,
pkcs11h_getMessage (rv)
@@ -749,7 +749,7 @@ _pkcs11h_session_reset (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_session_reset return rv=%ld-'%s', *p_slot=%ld",
+ "PKCS#11: _pkcs11h_session_reset return rv=%lu-'%s', *p_slot=%ld",
rv,
pkcs11h_getMessage (rv),
*p_slot
@@ -825,7 +825,7 @@ _pkcs11h_session_getObjectById (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_session_getObjectById return rv=%ld-'%s', *p_handle=%08lx",
+ "PKCS#11: _pkcs11h_session_getObjectById return rv=%lu-'%s', *p_handle=%08lx",
rv,
pkcs11h_getMessage (rv),
(unsigned long)*p_handle
@@ -881,7 +881,7 @@ _pkcs11h_session_validate (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_session_validate return rv=%ld-'%s'",
+ "PKCS#11: _pkcs11h_session_validate return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -1077,7 +1077,7 @@ _pkcs11h_session_login (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_session_login return rv=%ld-'%s'",
+ "PKCS#11: _pkcs11h_session_login return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
diff --git a/lib/pkcs11h-slotevent.c b/lib/pkcs11h-slotevent.c
index 814904d..30948da 100644
--- a/lib/pkcs11h-slotevent.c
+++ b/lib/pkcs11h-slotevent.c
@@ -423,7 +423,7 @@ _pkcs11h_slotevent_init (void) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_slotevent_init return rv=%ld-'%s'",
+ "PKCS#11: _pkcs11h_slotevent_init return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
diff --git a/lib/pkcs11h-token.c b/lib/pkcs11h-token.c
index 3472aa3..4520713 100644
--- a/lib/pkcs11h-token.c
+++ b/lib/pkcs11h-token.c
@@ -113,7 +113,7 @@ pkcs11h_token_duplicateTokenId (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_token_duplicateTokenId return rv=%ld-'%s', *to=%p",
+ "PKCS#11: pkcs11h_token_duplicateTokenId return rv=%lu-'%s', *to=%p",
rv,
pkcs11h_getMessage (rv),
(void *)*to
@@ -199,7 +199,7 @@ _pkcs11h_token_getTokenId (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_token_getTokenId return rv=%ld-'%s', *p_token_id=%p",
+ "PKCS#11: _pkcs11h_token_getTokenId return rv=%lu-'%s', *p_token_id=%p",
rv,
pkcs11h_getMessage (rv),
(void *)*p_token_id
@@ -232,7 +232,7 @@ _pkcs11h_token_newTokenId (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: _pkcs11h_token_newTokenId return rv=%ld-'%s', *p_token_id=%p",
+ "PKCS#11: _pkcs11h_token_newTokenId return rv=%lu-'%s', *p_token_id=%p",
rv,
pkcs11h_getMessage (rv),
(void *)*p_token_id
@@ -339,7 +339,7 @@ pkcs11h_token_login (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_token_login return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_token_login return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -415,7 +415,7 @@ pkcs11h_token_ensureAccess (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_token_ensureAccess return rv=%ld-'%s'",
+ "PKCS#11: pkcs11h_token_ensureAccess return rv=%lu-'%s'",
rv,
pkcs11h_getMessage (rv)
);
@@ -459,7 +459,7 @@ pkcs11h_token_freeTokenIdList (
CK_RV
pkcs11h_token_enumTokenIds (
- IN const int method,
+ IN const unsigned method,
OUT pkcs11h_token_id_list_t * const p_token_id_list
) {
#if defined(ENABLE_PKCS11H_THREADING)
@@ -476,7 +476,8 @@ pkcs11h_token_enumTokenIds (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_token_enumTokenIds entry p_token_id_list=%p",
+ "PKCS#11: pkcs11h_token_enumTokenIds entry method=%u, p_token_id_list=%p",
+ method,
(void *)p_token_id_list
);
@@ -560,7 +561,7 @@ pkcs11h_token_enumTokenIds (
if (rv != CKR_OK) {
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG1,
- "PKCS#11: Cannot get slot list for provider '%s' rv=%ld-'%s'",
+ "PKCS#11: Cannot get slot list for provider '%s' rv=%lu-'%s'",
current_provider->manufacturerID,
rv,
pkcs11h_getMessage (rv)
@@ -656,7 +657,7 @@ pkcs11h_token_enumTokenIds (
PKCS11H_DEBUG (
PKCS11H_LOG_DEBUG2,
- "PKCS#11: pkcs11h_token_enumTokenIds return rv=%ld-'%s', *p_token_id_list=%p",
+ "PKCS#11: pkcs11h_token_enumTokenIds return rv=%lu-'%s', *p_token_id_list=%p",
rv,
pkcs11h_getMessage (rv),
(void *)p_token_id_list
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git
More information about the pkg-opensc-commit
mailing list