---
usr/lib/pkcs11/api/api_interface.c | 3 ---
usr/lib/pkcs11/api/apiutil.c | 1 -
usr/lib/pkcs11/cca_stdll/cca_specific.c | 14 ++++----------
usr/lib/pkcs11/cca_stdll/key.c | 4 ----
usr/lib/pkcs11/cca_stdll/key_mgr.c | 3 +--
usr/lib/pkcs11/cca_stdll/new_host.c | 8 --------
usr/lib/pkcs11/common/loadsave.c | 1 -
usr/lib/pkcs11/common/mech_rsa.c | 8 +++-----
usr/lib/pkcs11/common/new_host.c | 8 --------
usr/lib/pkcs11/common/obj_mgr.c | 1 -
usr/lib/pkcs11/common/sess_mgr.c | 10 ----------
usr/lib/pkcs11/common/utility.c | 5 +++--
usr/lib/pkcs11/tpm_stdll/key_mgr.c | 3 +--
usr/lib/pkcs11/tpm_stdll/loadsave.c | 16 ++--------------
usr/lib/pkcs11/tpm_stdll/mech_des.c | 5 -----
usr/lib/pkcs11/tpm_stdll/mech_des3.c | 5 -----
usr/lib/pkcs11/tpm_stdll/mech_rsa.c | 10 +++-------
usr/lib/pkcs11/tpm_stdll/new_host.c | 29 ++---------------------------
usr/lib/pkcs11/tpm_stdll/tpm_specific.c | 3 +--
usr/lib/pkcs11/tpm_stdll/utility.c | 6 +++---
usr/sbin/pkcsconf/pkcsconf.c | 3 ---
21 files changed, 23 insertions(+), 123 deletions(-)
diff --git a/usr/lib/pkcs11/api/api_interface.c
b/usr/lib/pkcs11/api/api_interface.c
index e96eb1f..cbf26ab 100644
--- a/usr/lib/pkcs11/api/api_interface.c
+++ b/usr/lib/pkcs11/api/api_interface.c
@@ -404,9 +404,6 @@ C_CancelFunction ( CK_SESSION_HANDLE hSession )
CK_RV
C_CloseAllSessions ( CK_SLOT_ID slotID )
{
- CK_RV rv;
- API_Slot_t *sltp;
-
// Although why does modutil do a close all sessions. It is a single
// application it can only close its sessions...
// And all sessions should be closed anyhow.
diff --git a/usr/lib/pkcs11/api/apiutil.c b/usr/lib/pkcs11/api/apiutil.c
index a899738..fa6f84a 100644
--- a/usr/lib/pkcs11/api/apiutil.c
+++ b/usr/lib/pkcs11/api/apiutil.c
@@ -602,7 +602,6 @@ get_sess_count(CK_SLOT_ID slotID, CK_ULONG *ret)
{
Slot_Mgr_Shr_t *shm;
Slot_Info_t_64 *sinfp;
- Slot_Mgr_Proc_t_64 *procp;
shm = Anchor->SharedMemP;
diff --git a/usr/lib/pkcs11/cca_stdll/cca_specific.c
b/usr/lib/pkcs11/cca_stdll/cca_specific.c
index 1f2433e..6972411 100644
--- a/usr/lib/pkcs11/cca_stdll/cca_specific.c
+++ b/usr/lib/pkcs11/cca_stdll/cca_specific.c
@@ -205,7 +205,6 @@ CK_RV cca_key_gen(CK_BYTE *key, unsigned char *key_form,
unsigned char *key_type
unsigned char key_type_2[CCA_KEYWORD_SIZE] = { 0, };
unsigned char kek_key_identifier_1[CCA_KEY_ID_SIZE] = { 0, };
unsigned char kek_key_identifier_2[CCA_KEY_ID_SIZE] = { 0, };
- unsigned char *generated_key_identifier_1 = key;
unsigned char generated_key_identifier_2[CCA_KEY_ID_SIZE] = { 0, };
switch (key_size) {
@@ -255,8 +254,7 @@ CK_RV cca_key_gen(CK_BYTE *key, unsigned char *key_form,
unsigned char *key_type
CK_RV
token_specific_des_key_gen(CK_BYTE *des_key, CK_ULONG len, CK_ULONG key_size)
{
- long return_code, reason_code;
- unsigned char key_form[CCA_KEYWORD_SIZE], key_length[CCA_KEYWORD_SIZE];
+ unsigned char key_form[CCA_KEYWORD_SIZE];
unsigned char key_type_1[CCA_KEYWORD_SIZE];
DBG("Enter CCA DES keygen");
@@ -907,9 +905,7 @@ CK_RV
token_specific_aes_key_gen(CK_BYTE *aes_key, CK_ULONG key_size)
{
long return_code, reason_code;
- unsigned char key_length[CCA_KEYWORD_SIZE];
unsigned char key_token[CCA_KEY_ID_SIZE] = { 0, };
- unsigned char key_value[32];
unsigned char key_form[CCA_KEYWORD_SIZE];
unsigned char key_type[CCA_KEYWORD_SIZE];
unsigned char rule_array[CCA_RULE_ARRAY_SIZE] = { 0x20, };
@@ -987,9 +983,8 @@ token_specific_aes_ecb(CK_BYTE *in_data,
CK_BYTE encrypt)
{
- long return_code, reason_code, rule_array_count, length;
- long pad_character = 0, block_size = 16;
- unsigned char chaining_vector[CCA_OCV_SIZE];
+ long return_code, reason_code, rule_array_count;
+ long block_size = 16;
unsigned char rule_array[CCA_RULE_ARRAY_SIZE];
long opt_data_len = 0, key_params_len =0, exit_data_len = 0, IV_len =
0, chain_vector_len = 0;
char exit_data[0];
@@ -1077,8 +1072,7 @@ token_specific_aes_cbc(CK_BYTE *in_data,
CK_BYTE encrypt)
{
long return_code, reason_code, rule_array_count, length;
- long pad_character = 0, block_size = 16;
- unsigned char IV[8] = { 0xfe, 0x43, 0x12, 0xed, 0xaa, 0xbb, 0xdd, 0x90
};
+ long block_size = 16;
unsigned char chaining_vector[32];
unsigned char rule_array[CCA_RULE_ARRAY_SIZE];
long opt_data_len = 0, key_params_len =0, exit_data_len = 0, IV_len =
16, chain_vector_len = 32;
diff --git a/usr/lib/pkcs11/cca_stdll/key.c b/usr/lib/pkcs11/cca_stdll/key.c
index 08d0286..a09a619 100644
--- a/usr/lib/pkcs11/cca_stdll/key.c
+++ b/usr/lib/pkcs11/cca_stdll/key.c
@@ -3817,7 +3817,6 @@ des_unwrap( TEMPLATE *tmpl,
{
CK_ATTRIBUTE * value_attr = NULL;
CK_BYTE * ptr = NULL;
- CK_ULONG i;
if (data_len < DES_BLOCK_SIZE){
@@ -4158,7 +4157,6 @@ des3_unwrap( TEMPLATE *tmpl,
{
CK_ATTRIBUTE * value_attr = NULL;
CK_BYTE * ptr = NULL;
- CK_ULONG i;
if (data_len < 3 * DES_BLOCK_SIZE){
@@ -5203,7 +5201,6 @@ aes_check_required_attributes( TEMPLATE *tmpl, CK_ULONG
mode )
CK_RV
aes_validate_attribute( TEMPLATE *tmpl, CK_ATTRIBUTE *attr, CK_ULONG mode )
{
- CK_BYTE * ptr = NULL;
CK_ULONG val;
switch (attr->type) {
@@ -5296,7 +5293,6 @@ aes_unwrap( TEMPLATE *tmpl,
CK_ATTRIBUTE * value_attr = NULL;
CK_ATTRIBUTE * val_len_attr = NULL;
CK_BYTE * ptr = NULL;
- CK_ULONG i;
CK_ULONG key_size;
CK_BBOOL found = FALSE;
diff --git a/usr/lib/pkcs11/cca_stdll/key_mgr.c
b/usr/lib/pkcs11/cca_stdll/key_mgr.c
index 5c3b3cd..afff06d 100644
--- a/usr/lib/pkcs11/cca_stdll/key_mgr.c
+++ b/usr/lib/pkcs11/cca_stdll/key_mgr.c
@@ -1365,10 +1365,9 @@ key_mgr_derive_key( SESSION * sess,
case CKM_SSL3_KEY_AND_MAC_DERIVE:
{
- CK_SSL3_KEY_MAT_PARAMS *params = (CK_SSL3_KEY_MAT_PARAMS
*)mech->pParameter;
-
// Check FCV
//
+// CK_SSL3_KEY_MAT_PARAMS *params = (CK_SSL3_KEY_MAT_PARAMS
*)mech->pParameter;
// if (((nv_FCV.FunctionCntlBytes[DES_FUNCTION_BYTE] & FCV_56_BIT_DES)
== 0) && (params->bIsExport == FALSE))
// return CKR_MECHANISM_INVALID;
diff --git a/usr/lib/pkcs11/cca_stdll/new_host.c
b/usr/lib/pkcs11/cca_stdll/new_host.c
index a9ed159..8052c47 100644
--- a/usr/lib/pkcs11/cca_stdll/new_host.c
+++ b/usr/lib/pkcs11/cca_stdll/new_host.c
@@ -1076,7 +1076,6 @@ CK_RV SC_OpenSession(CK_SLOT_ID sid,
CK_RV SC_CloseSession( ST_SESSION_HANDLE *sSession )
{
- SESSION * sess = NULL;
CK_RV rc = CKR_OK;
CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
LOCKIT;
@@ -3470,7 +3469,6 @@ CK_RV SC_DigestEncryptUpdate( ST_SESSION_HANDLE
*sSession,
CK_BYTE_PTR pEncryptedPart,
CK_ULONG_PTR pulEncryptedPartLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -3488,7 +3486,6 @@ CK_RV SC_DecryptDigestUpdate( ST_SESSION_HANDLE
*sSession,
CK_BYTE_PTR pPart,
CK_ULONG_PTR pulPartLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -3507,7 +3504,6 @@ CK_RV SC_SignEncryptUpdate( ST_SESSION_HANDLE *sSession,
CK_BYTE_PTR pEncryptedPart,
CK_ULONG_PTR pulEncryptedPartLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -3525,7 +3521,6 @@ CK_RV SC_DecryptVerifyUpdate( ST_SESSION_HANDLE
*sSession,
CK_BYTE_PTR pPart,
CK_ULONG_PTR pulPartLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -3962,7 +3957,6 @@ CK_RV SC_SeedRandom( ST_SESSION_HANDLE *sSession,
CK_BYTE_PTR pSeed,
CK_ULONG ulSeedLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -4020,7 +4014,6 @@ CK_RV SC_GenerateRandom( ST_SESSION_HANDLE *sSession,
//
CK_RV SC_GetFunctionStatus( ST_SESSION_HANDLE *sSession )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -4034,7 +4027,6 @@ CK_RV SC_GetFunctionStatus( ST_SESSION_HANDLE *sSession )
//
CK_RV SC_CancelFunction( ST_SESSION_HANDLE *sSession )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
diff --git a/usr/lib/pkcs11/common/loadsave.c b/usr/lib/pkcs11/common/loadsave.c
index 5c20983..7ca0e5b 100644
--- a/usr/lib/pkcs11/common/loadsave.c
+++ b/usr/lib/pkcs11/common/loadsave.c
@@ -426,7 +426,6 @@ save_token_data()
TOKEN_DATA td;
CK_RV rc;
CK_BYTE fname[PATH_MAX];
- fpos_t fpos;
sprintf((char *)fname,"%s/%s",pk_dir, PK_LITE_NV);
diff --git a/usr/lib/pkcs11/common/mech_rsa.c b/usr/lib/pkcs11/common/mech_rsa.c
index 29b2edc..467dacd 100644
--- a/usr/lib/pkcs11/common/mech_rsa.c
+++ b/usr/lib/pkcs11/common/mech_rsa.c
@@ -673,7 +673,7 @@ rsa_pkcs_decrypt( SESSION *sess,
{
OBJECT *key_obj = NULL;
CK_BYTE out[512]; // 4096 bits
- CK_ULONG i, modulus_bytes;
+ CK_ULONG modulus_bytes;
CK_RV rc;
@@ -810,7 +810,7 @@ rsa_pkcs_verify( SESSION * sess,
OBJECT *key_obj = NULL;
CK_ATTRIBUTE *attr = NULL;
CK_BYTE out[512], out_data[512]; // 4096 bits
- CK_ULONG i, modulus_bytes, out_data_len=512;
+ CK_ULONG modulus_bytes, out_data_len=512;
CK_BBOOL flag;
CK_RV rc;
@@ -838,8 +838,6 @@ rsa_pkcs_verify( SESSION * sess,
//
rc = ckm_rsa_encrypt( signature, modulus_bytes, out, key_obj );
if (rc == CKR_OK) {
- CK_ULONG len;
-
rc = rsa_parse_block( out, modulus_bytes, out_data, &out_data_len,
PKCS_BT_1);
if (rc == CKR_OK) {
if (in_data_len != out_data_len){
@@ -881,7 +879,7 @@ rsa_pkcs_verify_recover( SESSION * sess,
OBJECT *key_obj = NULL;
CK_ATTRIBUTE *attr = NULL;
CK_BYTE out[512]; // 4096 bits
- CK_ULONG i, modulus_bytes;
+ CK_ULONG modulus_bytes;
CK_BBOOL flag;
CK_RV rc;
diff --git a/usr/lib/pkcs11/common/new_host.c b/usr/lib/pkcs11/common/new_host.c
index b542786..48b6b2f 100644
--- a/usr/lib/pkcs11/common/new_host.c
+++ b/usr/lib/pkcs11/common/new_host.c
@@ -1356,7 +1356,6 @@ CK_RV SC_OpenSession(CK_SLOT_ID sid,
CK_RV SC_CloseSession( ST_SESSION_HANDLE *sSession )
{
- SESSION * sess = NULL;
CK_RV rc = CKR_OK;
CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
LOCKIT;
@@ -3750,7 +3749,6 @@ CK_RV SC_DigestEncryptUpdate( ST_SESSION_HANDLE
*sSession,
CK_BYTE_PTR pEncryptedPart,
CK_ULONG_PTR pulEncryptedPartLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -3768,7 +3766,6 @@ CK_RV SC_DecryptDigestUpdate( ST_SESSION_HANDLE
*sSession,
CK_BYTE_PTR pPart,
CK_ULONG_PTR pulPartLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -3787,7 +3784,6 @@ CK_RV SC_SignEncryptUpdate( ST_SESSION_HANDLE *sSession,
CK_BYTE_PTR pEncryptedPart,
CK_ULONG_PTR pulEncryptedPartLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -3805,7 +3801,6 @@ CK_RV SC_DecryptVerifyUpdate( ST_SESSION_HANDLE
*sSession,
CK_BYTE_PTR pPart,
CK_ULONG_PTR pulPartLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -4242,7 +4237,6 @@ CK_RV SC_SeedRandom( ST_SESSION_HANDLE *sSession,
CK_BYTE_PTR pSeed,
CK_ULONG ulSeedLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -4300,7 +4294,6 @@ CK_RV SC_GenerateRandom( ST_SESSION_HANDLE *sSession,
//
CK_RV SC_GetFunctionStatus( ST_SESSION_HANDLE *sSession )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -4314,7 +4307,6 @@ CK_RV SC_GetFunctionStatus( ST_SESSION_HANDLE *sSession )
//
CK_RV SC_CancelFunction( ST_SESSION_HANDLE *sSession )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
diff --git a/usr/lib/pkcs11/common/obj_mgr.c b/usr/lib/pkcs11/common/obj_mgr.c
index 98c414a..98c54cc 100644
--- a/usr/lib/pkcs11/common/obj_mgr.c
+++ b/usr/lib/pkcs11/common/obj_mgr.c
@@ -1232,7 +1232,6 @@ CK_RV
object_mgr_find_in_map_nocache( CK_OBJECT_HANDLE handle,
OBJECT ** ptr )
{
- DL_NODE * node = NULL;
OBJECT_MAP * map = NULL;
OBJECT * obj = NULL;
CK_RV rc = CKR_OK;
diff --git a/usr/lib/pkcs11/common/sess_mgr.c b/usr/lib/pkcs11/common/sess_mgr.c
index f9ae9bc..4c7ed34 100644
--- a/usr/lib/pkcs11/common/sess_mgr.c
+++ b/usr/lib/pkcs11/common/sess_mgr.c
@@ -316,7 +316,6 @@
SESSION *
session_mgr_find( CK_SESSION_HANDLE handle )
{
- struct btnode *n;
SESSION * result = NULL;
CK_RV rc;
@@ -350,7 +349,6 @@ CK_RV
session_mgr_new( CK_ULONG flags, CK_SLOT_ID slot_id, CK_SESSION_HANDLE_PTR
phSession )
{
SESSION * new_session = NULL;
- SESSION * s = NULL;
CK_BBOOL user_session = FALSE;
CK_BBOOL so_session = FALSE;
CK_BBOOL pkcs_locked = TRUE;
@@ -559,7 +557,6 @@ session_mgr_readonly_session_exists( void )
CK_RV
session_mgr_close_session( CK_SESSION_HANDLE handle )
{
- struct btnode *n;
SESSION *sess;
CK_RV rc = CKR_OK;
@@ -705,8 +702,6 @@ CK_RV
session_mgr_close_all_sessions( void )
{
CK_RV rc = CKR_OK;
- SESSION *sess;
- unsigned long i;
rc = MY_LockMutex( &sess_list_mutex );
if (rc != CKR_OK){
@@ -755,9 +750,6 @@ session_login(void *node_value, unsigned long node_idx,
void *p3)
CK_RV
session_mgr_login_all( CK_USER_TYPE user_type )
{
- struct btnode *n;
- unsigned long i;
- SESSION *s;
CK_RV rc = CKR_OK;
rc = MY_LockMutex( &sess_list_mutex );
@@ -801,8 +793,6 @@ session_logout(void *node_value, unsigned long node_idx,
void *p3)
CK_RV
session_mgr_logout_all( void )
{
- unsigned long i;
- SESSION * s = NULL;
CK_RV rc = CKR_OK;
rc = MY_LockMutex( &sess_list_mutex );
diff --git a/usr/lib/pkcs11/common/utility.c b/usr/lib/pkcs11/common/utility.c
index 317f3ae..4247798 100644
--- a/usr/lib/pkcs11/common/utility.c
+++ b/usr/lib/pkcs11/common/utility.c
@@ -1148,12 +1148,13 @@ parity_is_odd( CK_BYTE b )
CK_RV
attach_shm()
{
- key_t key;
- int shm_id;
struct stat statbuf;
CK_BBOOL created = FALSE;
#if !(NOSHM) && !(MMAP)
+ key_t key;
+ int shm_id;
+
// Change TOK_PATH2 to be the directory
// of the data store specified. This way we
// have a unique key shared memory for each
diff --git a/usr/lib/pkcs11/tpm_stdll/key_mgr.c
b/usr/lib/pkcs11/tpm_stdll/key_mgr.c
index 5abbb64..41e8262 100644
--- a/usr/lib/pkcs11/tpm_stdll/key_mgr.c
+++ b/usr/lib/pkcs11/tpm_stdll/key_mgr.c
@@ -1096,10 +1096,9 @@ key_mgr_derive_key( SESSION * sess,
case CKM_SSL3_KEY_AND_MAC_DERIVE:
{
- CK_SSL3_KEY_MAT_PARAMS *params = (CK_SSL3_KEY_MAT_PARAMS
*)mech->pParameter;
-
// Check FCV
//
+// CK_SSL3_KEY_MAT_PARAMS *params = (CK_SSL3_KEY_MAT_PARAMS
*)mech->pParameter;
// if (((nv_FCV.FunctionCntlBytes[DES_FUNCTION_BYTE] & FCV_56_BIT_DES)
== 0) && (params->bIsExport == FALSE))
// return CKR_MECHANISM_INVALID;
diff --git a/usr/lib/pkcs11/tpm_stdll/loadsave.c
b/usr/lib/pkcs11/tpm_stdll/loadsave.c
index 7c23e2a..7e057b4 100644
--- a/usr/lib/pkcs11/tpm_stdll/loadsave.c
+++ b/usr/lib/pkcs11/tpm_stdll/loadsave.c
@@ -356,9 +356,6 @@ load_token_data()
FILE * fp;
CK_BYTE fname[PATH_MAX];
TOKEN_DATA td;
- CK_BYTE clear[3 * DES_BLOCK_SIZE]; // enough to hold a CBC-encrypted
SHA hash
- CK_BYTE cipher[3 * DES_BLOCK_SIZE];
- CK_ULONG clear_len, cipher_len;
CK_RV rc;
struct passwd *pw = NULL;
@@ -454,9 +451,6 @@ save_token_data()
{
FILE *fp;
TOKEN_DATA td;
- CK_BYTE clear[3 * DES_BLOCK_SIZE];
- CK_BYTE cipher[3 * DES_BLOCK_SIZE];
- CK_ULONG clear_len, cipher_len;
CK_RV rc;
CK_BYTE fname[PATH_MAX];
struct passwd *pw = NULL;
@@ -661,10 +655,9 @@ save_private_token_object( OBJECT *obj )
CK_BYTE * ptr = NULL;
CK_BYTE fname[100];
CK_BYTE hash_sha[SHA1_HASH_SIZE];
- CK_BYTE hash_md5[MD5_HASH_SIZE];
CK_BYTE aes_key[AES_KEY_SIZE_256];
CK_BYTE aes_iv[AES_BLOCK_SIZE];
- CK_ULONG obj_data_len,cleartxt_len, ciphertxt_len, hash_len, tmp,
tmp2;
+ CK_ULONG obj_data_len,cleartxt_len, ciphertxt_len;
CK_ULONG padded_len;
CK_BBOOL flag;
CK_RV rc;
@@ -872,12 +865,10 @@ load_private_token_objects( void )
FILE *fp1 = NULL, *fp2 = NULL;
CK_BYTE *buf = NULL;
CK_BYTE tmp[PATH_MAX], fname[PATH_MAX],iname[PATH_MAX];
- CK_BYTE sha_hash[SHA1_HASH_SIZE], old_hash[SHA1_HASH_SIZE];
CK_BBOOL priv;
CK_ULONG_32 size;
CK_RV rc;
struct passwd *pw = NULL;
- size_t buf_size;
if ((pw = getpwuid(getuid())) == NULL){
LogError("getpwuid failed: %s", strerror(errno));
@@ -970,10 +961,7 @@ restore_private_token_object( CK_BYTE * data,
CK_BYTE aes_key[AES_KEY_SIZE_256];
CK_BYTE aes_iv[AES_BLOCK_SIZE];
CK_BYTE hash_sha[SHA1_HASH_SIZE];
- CK_MECHANISM mech;
- DIGEST_CONTEXT digest_ctx;
- ENCR_DECR_CONTEXT encr_ctx;
- CK_ULONG hash_len, cleartxt_len, obj_data_len;
+ CK_ULONG cleartxt_len, obj_data_len;
CK_RV rc;
// format for the object data:
diff --git a/usr/lib/pkcs11/tpm_stdll/mech_des.c
b/usr/lib/pkcs11/tpm_stdll/mech_des.c
index 7a9e034..8432736 100644
--- a/usr/lib/pkcs11/tpm_stdll/mech_des.c
+++ b/usr/lib/pkcs11/tpm_stdll/mech_des.c
@@ -1293,7 +1293,6 @@ ckm_des_key_gen( TEMPLATE *tmpl )
CK_ATTRIBUTE * class_attr = NULL;
CK_ATTRIBUTE * local_attr = NULL;
CK_BYTE des_key[DES_KEY_SIZE];
- CK_ULONG req_len, repl_len, expected_repl_len;
CK_ULONG rc;
// Checking for a weak key is redundant in that the token
// specific keygen may already do this
@@ -1438,7 +1437,6 @@ ckm_des_ecb_encrypt( CK_BYTE * in_data,
CK_ULONG * out_data_len,
CK_BYTE * key_value )
{
- CK_ULONG req_len, repl_len, expected_repl_len;
CK_ULONG rc;
@@ -1467,7 +1465,6 @@ ckm_des_ecb_decrypt( CK_BYTE * in_data,
CK_ULONG * out_data_len,
CK_BYTE * key_value )
{
- CK_ULONG req_len, repl_len, expected_repl_len;
CK_ULONG rc;
@@ -1499,7 +1496,6 @@ ckm_des_cbc_encrypt( CK_BYTE * in_data,
CK_BYTE * init_v,
CK_BYTE * key_value )
{
- CK_ULONG req_len, repl_len, expected_repl_len;
CK_ULONG rc;
@@ -1536,7 +1532,6 @@ ckm_des_cbc_decrypt( CK_BYTE * in_data,
CK_BYTE * init_v,
CK_BYTE * key_value )
{
- CK_ULONG req_len, repl_len, expected_repl_len;
CK_ULONG rc;
diff --git a/usr/lib/pkcs11/tpm_stdll/mech_des3.c
b/usr/lib/pkcs11/tpm_stdll/mech_des3.c
index d3a06ba..82df6ff 100644
--- a/usr/lib/pkcs11/tpm_stdll/mech_des3.c
+++ b/usr/lib/pkcs11/tpm_stdll/mech_des3.c
@@ -1521,7 +1521,6 @@ ckm_des3_key_gen( TEMPLATE *tmpl )
CK_ATTRIBUTE * class_attr = NULL;
CK_ATTRIBUTE * local_attr = NULL;
CK_BYTE des_key[3 * DES_KEY_SIZE];
- CK_ULONG req_len, repl_len, expected_repl_len;
CK_ULONG rc;
rc = token_specific.t_des_key_gen(des_key, sizeof(des_key));
@@ -1581,7 +1580,6 @@ ckm_des3_ecb_encrypt( CK_BYTE * in_data,
CK_ULONG * out_data_len,
CK_BYTE * key_value )
{
- CK_ULONG req_len, repl_len, expected_repl_len;
CK_ULONG rc;
@@ -1612,7 +1610,6 @@ ckm_des3_ecb_decrypt( CK_BYTE * in_data,
CK_ULONG * out_data_len,
CK_BYTE * key_value )
{
- CK_ULONG req_len, repl_len, expected_repl_len;
CK_ULONG rc;
@@ -1644,7 +1641,6 @@ ckm_des3_cbc_encrypt( CK_BYTE * in_data,
CK_BYTE * init_v,
CK_BYTE * key_value )
{
- CK_ULONG req_len, repl_len, expected_repl_len;
CK_ULONG rc;
@@ -1681,7 +1677,6 @@ ckm_des3_cbc_decrypt( CK_BYTE * in_data,
CK_BYTE * init_v,
CK_BYTE * key_value )
{
- CK_ULONG req_len, repl_len, expected_repl_len;
CK_ULONG rc;
diff --git a/usr/lib/pkcs11/tpm_stdll/mech_rsa.c
b/usr/lib/pkcs11/tpm_stdll/mech_rsa.c
index 7d1de90..c9a47af 100644
--- a/usr/lib/pkcs11/tpm_stdll/mech_rsa.c
+++ b/usr/lib/pkcs11/tpm_stdll/mech_rsa.c
@@ -68,7 +68,6 @@ ckm_rsa_encrypt( CK_BYTE * in_data,
OBJECT * key_obj )
{
CK_ATTRIBUTE * attr = NULL;
- CK_ATTRIBUTE * modulus = NULL;
CK_OBJECT_CLASS keyclass;
CK_RV rc;
@@ -213,7 +212,6 @@ rsa_pkcs_encrypt( SESSION *sess,
{
OBJECT *key_obj = NULL;
CK_ATTRIBUTE *attr = NULL;
- CK_BYTE clear[256], cipher[256]; // 2048 bits
CK_ULONG modulus_bytes;
CK_BBOOL flag;
CK_RV rc;
@@ -270,7 +268,7 @@ rsa_pkcs_decrypt( SESSION *sess,
{
OBJECT *key_obj = NULL;
CK_ATTRIBUTE *attr = NULL;
- CK_ULONG i, modulus_bytes;
+ CK_ULONG modulus_bytes;
CK_BBOOL flag;
CK_RV rc;
@@ -325,7 +323,6 @@ rsa_pkcs_sign( SESSION *sess,
{
OBJECT *key_obj = NULL;
CK_ATTRIBUTE *attr = NULL;
- CK_BYTE data[256], sig[256]; // max size: 256 bytes == 2048 bits
CK_ULONG modulus_bytes;
CK_BBOOL flag;
CK_RV rc;
@@ -394,8 +391,7 @@ rsa_pkcs_verify( SESSION * sess,
{
OBJECT *key_obj = NULL;
CK_ATTRIBUTE *attr = NULL;
- CK_BYTE out[256]; // 2048 bits
- CK_ULONG i, modulus_bytes, out_len = 256;
+ CK_ULONG modulus_bytes;
CK_BBOOL flag;
CK_RV rc;
@@ -459,7 +455,7 @@ rsa_pkcs_verify_recover( SESSION * sess,
{
OBJECT *key_obj = NULL;
CK_ATTRIBUTE *attr = NULL;
- CK_ULONG i, modulus_bytes;
+ CK_ULONG modulus_bytes;
CK_BBOOL flag;
CK_RV rc;
diff --git a/usr/lib/pkcs11/tpm_stdll/new_host.c
b/usr/lib/pkcs11/tpm_stdll/new_host.c
index fc210e2..a0d813d 100644
--- a/usr/lib/pkcs11/tpm_stdll/new_host.c
+++ b/usr/lib/pkcs11/tpm_stdll/new_host.c
@@ -204,8 +204,6 @@ int
APISlot2Local(snum)
CK_SLOT_ID snum;
{
- int i;
-
return(token_specific.t_slot2local(snum));
}
@@ -309,10 +307,8 @@ CK_RV ST_Initialize( void **FunctionList,
CK_SLOT_ID SlotNumber,
char *Correlator)
{
- int i, j;
+ int i;
CK_RV rc = CKR_OK;
- char tstr[2048];
- char *pkdir;
struct passwd *pw,*epw; // SAB XXX XXX
uid_t userid,euserid;
@@ -328,9 +324,7 @@ CK_RV ST_Initialize( void **FunctionList,
if ( userid != 0 && euserid != 0 ) { // Root or effective Root is ok
struct group *grp;
- char *name,*g;
int rc = 0;
- int index = 0;
gid_t gid,egid;
grp = getgrnam("pkcs11");
if ( grp ) {
@@ -493,9 +487,7 @@ done:
// clear the other stuff
CK_RV SC_Finalize( CK_SLOT_ID sid )
{
- CK_ULONG req_len, repl_len;
- CK_ULONG i;
- CK_RV rc, rc2;
+ CK_RV rc;
SLT_CHECK
if (st_Initialized() == FALSE) {
@@ -919,8 +911,6 @@ CK_RV SC_InitPIN( ST_SESSION_HANDLE *sSession,
CK_ULONG ulPinLen )
{
SESSION * sess = NULL;
- CK_BYTE hash_sha[SHA1_HASH_SIZE];
- CK_BYTE hash_md5[MD5_HASH_SIZE];
CK_RV rc = CKR_OK;
CK_FLAGS_32 * flags = NULL;
CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
@@ -1032,12 +1022,6 @@ CK_RV SC_SetPIN( ST_SESSION_HANDLE *sSession,
CK_ULONG ulNewLen )
{
SESSION * sess = NULL;
- CK_BYTE old_hash_sha[SHA1_HASH_SIZE];
- CK_BYTE new_hash_sha[SHA1_HASH_SIZE];
- CK_BYTE hash_md5[MD5_HASH_SIZE];
- CK_MECHANISM mech;
- DIGEST_CONTEXT digest_ctx;
- CK_ULONG hash_len;
CK_RV rc = CKR_OK;
CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
@@ -1267,7 +1251,6 @@ done:
//
CK_RV SC_CloseSession( ST_SESSION_HANDLE *sSession )
{
- SESSION * sess = NULL;
CK_RV rc = CKR_OK;
CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
@@ -1475,7 +1458,6 @@ CK_RV SC_Login( ST_SESSION_HANDLE *sSession,
{
SESSION * sess = NULL;
CK_FLAGS_32 * flags = NULL;
- CK_BYTE hash_sha[SHA1_HASH_SIZE];
CK_RV rc = CKR_OK;
CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
@@ -3650,7 +3632,6 @@ CK_RV SC_DigestEncryptUpdate( ST_SESSION_HANDLE
*sSession,
CK_BYTE_PTR pEncryptedPart,
CK_ULONG_PTR pulEncryptedPartLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -3668,7 +3649,6 @@ CK_RV SC_DecryptDigestUpdate( ST_SESSION_HANDLE
*sSession,
CK_BYTE_PTR pPart,
CK_ULONG_PTR pulPartLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -3687,7 +3667,6 @@ CK_RV SC_SignEncryptUpdate( ST_SESSION_HANDLE *sSession,
CK_BYTE_PTR pEncryptedPart,
CK_ULONG_PTR pulEncryptedPartLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -3705,7 +3684,6 @@ CK_RV SC_DecryptVerifyUpdate( ST_SESSION_HANDLE
*sSession,
CK_BYTE_PTR pPart,
CK_ULONG_PTR pulPartLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -4142,7 +4120,6 @@ CK_RV SC_SeedRandom( ST_SESSION_HANDLE *sSession,
CK_BYTE_PTR pSeed,
CK_ULONG ulSeedLen )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -4200,7 +4177,6 @@ done:
//
CK_RV SC_GetFunctionStatus( ST_SESSION_HANDLE *sSession )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
@@ -4214,7 +4190,6 @@ CK_RV SC_GetFunctionStatus( ST_SESSION_HANDLE *sSession )
//
CK_RV SC_CancelFunction( ST_SESSION_HANDLE *sSession )
{
- CK_SESSION_HANDLE hSession = SESS_HANDLE(sSession);
if (st_Initialized() == FALSE){
st_err_log(72, __FILE__, __LINE__);
return CKR_CRYPTOKI_NOT_INITIALIZED;
diff --git a/usr/lib/pkcs11/tpm_stdll/tpm_specific.c
b/usr/lib/pkcs11/tpm_stdll/tpm_specific.c
index dd5abca..544edff 100644
--- a/usr/lib/pkcs11/tpm_stdll/tpm_specific.c
+++ b/usr/lib/pkcs11/tpm_stdll/tpm_specific.c
@@ -388,7 +388,7 @@ token_wrap_key_object( CK_OBJECT_HANDLE ckObject, TSS_HKEY
hParentKey, TSS_HKEY
{
CK_RV rc = CKR_OK;
CK_ATTRIBUTE *attr = NULL, *new_attr, *prime_attr;
- CK_ULONG class, key_type, pub_exp;
+ CK_ULONG class, key_type;
CK_BBOOL found;
OBJECT *obj;
@@ -2368,7 +2368,6 @@ CK_RV
token_specific_rsa_generate_keypair( TEMPLATE * publ_tmpl,
TEMPLATE * priv_tmpl )
{
- CK_ATTRIBUTE *publ_exp = NULL;
CK_ATTRIBUTE *attr = NULL;
CK_ULONG mod_bits = 0;
CK_BBOOL flag;
diff --git a/usr/lib/pkcs11/tpm_stdll/utility.c
b/usr/lib/pkcs11/tpm_stdll/utility.c
index 0ff902c..c1e4a62 100644
--- a/usr/lib/pkcs11/tpm_stdll/utility.c
+++ b/usr/lib/pkcs11/tpm_stdll/utility.c
@@ -51,13 +51,13 @@
CK_RV
attach_shm()
{
- key_t key;
- int shm_id;
struct stat statbuf;
CK_BBOOL created = FALSE;
- void *temp = NULL;
#if !(NOSHM) && !(MMAP)
+ key_t key;
+ int shm_id;
+
// Change TOK_PATH2 to be the directory
// of the data store specified. This way we
// have a unique key shared memory for each
diff --git a/usr/sbin/pkcsconf/pkcsconf.c b/usr/sbin/pkcsconf/pkcsconf.c
index a3bd617..257604f 100644
--- a/usr/sbin/pkcsconf/pkcsconf.c
+++ b/usr/sbin/pkcsconf/pkcsconf.c
@@ -799,7 +799,6 @@ display_pkcs11_info(void){
CK_RV
get_slot_list(){
CK_RV rc; // Return Code
- CK_SLOT_ID_PTR TempSlotList = NULL; // Temporary Slot List
/* Find out how many tokens are present in slots */
rc = FunctionPtr->C_GetSlotList(TRUE, NULL_PTR, &SlotCount);
@@ -1127,8 +1126,6 @@ init_token(int slot_id, CK_CHAR_PTR pin){
CK_CHAR label[32], // What we want to set the Label of the card
to
enteredlabel[33]; // Max size of 32 + carriage return;
- unsigned int lcv; // Loop Control Varable
-
/* Find out the size of the entered PIN */
pinlen = strlen((char *)pin);
--
1.7.5.rc1
------------------------------------------------------------------------------
Fulfilling the Lean Software Promise
Lean software platforms are now widely adopted and the benefits have been
demonstrated beyond question. Learn why your peers are replacing JEE
containers with lightweight application servers - and what you can gain
from the move. http://p.sf.net/sfu/vmware-sfemails
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
