From fac4bd60089690cea0e1beeb8b1a0fc13aeaa5f6 Mon Sep 17 00:00:00 2001 From: aet Date: Thu, 2 Oct 2003 08:29:32 +0000 Subject: [PATCH] Tweak out some compiler warnings git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1486 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/pkcs11/framework-pkcs15.c | 7 ++++--- src/pkcs11/mechanism.c | 25 +++++++++++++------------ src/pkcs11/sc-pkcs11.h | 4 ++-- src/tools/pkcs11-tool.c | 5 ++--- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/pkcs11/framework-pkcs15.c b/src/pkcs11/framework-pkcs15.c index d5ca840b..e674a0fe 100644 --- a/src/pkcs11/framework-pkcs15.c +++ b/src/pkcs11/framework-pkcs15.c @@ -1872,11 +1872,12 @@ pkcs15_prkey_unwrap(struct sc_pkcs11_session *ses, void *obj, CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulAttributeCount, void **result) { - u8 unwrapped_key[256]; - int key_len = sizeof(unwrapped_key), rv; + u8 unwrapped_key[256]; + CK_ULONG key_len = sizeof(unwrapped_key); + CK_RV rv; rv = pkcs15_prkey_decrypt(ses, obj, pMechanism, pData, ulDataLen, - unwrapped_key, &key_len); + unwrapped_key, &key_len); if (rv < 0) return sc_to_cryptoki_error(rv, ses->slot->card->reader); diff --git a/src/pkcs11/mechanism.c b/src/pkcs11/mechanism.c index 695cc603..55fcab17 100644 --- a/src/pkcs11/mechanism.c +++ b/src/pkcs11/mechanism.c @@ -641,15 +641,17 @@ done: /* * Initialize a decryption context. When we get here, we know * the key object is capable of decrypting _something_ - */sc_pkcs11_decr_init(struct sc_pkcs11_session *session, - CK_MECHANISM_PTR pMechanism, - struct sc_pkcs11_object *key, - CK_MECHANISM_TYPE key_type) + */ +CK_RV +sc_pkcs11_decr_init(struct sc_pkcs11_session *session, + CK_MECHANISM_PTR pMechanism, + struct sc_pkcs11_object *key, + CK_MECHANISM_TYPE key_type) { struct sc_pkcs11_card *p11card; sc_pkcs11_operation_t *operation; sc_pkcs11_mechanism_type_t *mt; - int rv; + CK_RV rv; if (!session || !session->slot || !(p11card = session->slot->card)) @@ -679,8 +681,8 @@ done: CK_RV sc_pkcs11_decr(struct sc_pkcs11_session *session, - CK_BYTE_PTR pEncryptedData, CK_ULONG ulEncryptedDataLen, - CK_BYTE_PTR pData, CK_ULONG_PTR pulDataLen) + CK_BYTE_PTR pEncryptedData, CK_ULONG ulEncryptedDataLen, + CK_BYTE_PTR pData, CK_ULONG_PTR pulDataLen) { sc_pkcs11_operation_t *op; int rv; @@ -692,7 +694,6 @@ sc_pkcs11_decr(struct sc_pkcs11_session *session, rv = op->type->decrypt(op, pEncryptedData, ulEncryptedDataLen, pData, pulDataLen); -done: if (rv != CKR_BUFFER_TOO_SMALL && pData != NULL) session_stop_operation(session, SC_PKCS11_OPERATION_DECRYPT); @@ -704,7 +705,7 @@ done: */ static CK_RV sc_pkcs11_decrypt_init(sc_pkcs11_operation_t *operation, - struct sc_pkcs11_object *key) + struct sc_pkcs11_object *key) { struct signature_data *data; @@ -717,13 +718,13 @@ sc_pkcs11_decrypt_init(sc_pkcs11_operation_t *operation, return CKR_OK; } +static CK_RV sc_pkcs11_decrypt(sc_pkcs11_operation_t *operation, - CK_BYTE_PTR pEncryptedData, CK_ULONG ulEncryptedDataLen, - CK_BYTE_PTR pData, CK_ULONG_PTR pulDataLen) + CK_BYTE_PTR pEncryptedData, CK_ULONG ulEncryptedDataLen, + CK_BYTE_PTR pData, CK_ULONG_PTR pulDataLen) { struct signature_data *data; struct sc_pkcs11_object *key; - int rv; data = (struct signature_data*) operation->priv_data; diff --git a/src/pkcs11/sc-pkcs11.h b/src/pkcs11/sc-pkcs11.h index 80968fd8..d000bc6d 100644 --- a/src/pkcs11/sc-pkcs11.h +++ b/src/pkcs11/sc-pkcs11.h @@ -399,8 +399,8 @@ CK_RV sc_pkcs11_verif_init(struct sc_pkcs11_session *, CK_MECHANISM_PTR, CK_RV sc_pkcs11_verif_update(struct sc_pkcs11_session *, CK_BYTE_PTR, CK_ULONG); CK_RV sc_pkcs11_verif_final(struct sc_pkcs11_session *, CK_BYTE_PTR, CK_ULONG); #endif -CK_RV sc_pkcs11_sign_hash(struct sc_pkcs11_session *, CK_BYTE_PTR, CK_ULONG, - CK_BYTE_PTR, CK_ULONG_PTR); +CK_RV sc_pkcs11_decr_init(struct sc_pkcs11_session *, CK_MECHANISM_PTR, struct sc_pkcs11_object *, CK_MECHANISM_TYPE); +CK_RV sc_pkcs11_decr(struct sc_pkcs11_session *, CK_BYTE_PTR, CK_ULONG, CK_BYTE_PTR, CK_ULONG_PTR); sc_pkcs11_mechanism_type_t *sc_pkcs11_find_mechanism(struct sc_pkcs11_card *, CK_MECHANISM_TYPE, int); sc_pkcs11_mechanism_type_t *sc_pkcs11_new_fw_mechanism(CK_MECHANISM_TYPE, diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c index c7ad9645..e6b90531 100644 --- a/src/tools/pkcs11-tool.c +++ b/src/tools/pkcs11-tool.c @@ -2079,11 +2079,10 @@ static int encrypt_decrypt(CK_SLOT_ID slot, CK_SESSION_HANDLE session, CK_OBJECT_HANDLE privKeyObject) { EVP_PKEY *pkey; - EVP_CIPHER_CTX encrypt_ctx; unsigned char orig_data[] = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', '\0'}; unsigned char encrypted[512], data[512]; CK_MECHANISM mech; - int encrypted_len, data_len, r; + CK_ULONG encrypted_len, data_len; CK_RV rv; pkey = get_public_key(session, privKeyObject); @@ -2115,7 +2114,7 @@ encrypt_decrypt(CK_SLOT_ID slot, CK_SESSION_HANDLE session, CK_OBJECT_HANDLE pri data_len = encrypted_len; rv = p11->C_Decrypt(session, encrypted, encrypted_len, data, &data_len); if (rv != CKR_OK) - p11_fatal("C_DecryptInit", rv); + p11_fatal("C_Decrypt", rv); if (data_len != sizeof(orig_data) || memcmp(orig_data, data, data_len)) { printf(" resulting cleartext doesn't match input\n");