giomba/opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkcs11-tool.c: fix 2 compiler warnings

Browse Source 
pkcs11-tool.c:2650:25: warning: unused variable 'ecdh_parms' [-Wunused-variable]
        CK_ECDH1_DERIVE_PARAMS ecdh_parms;
                               ^
pkcs11-tool.c:2021:7: warning: unused variable 'is_private' [-Wunused-variable]
                int is_private = opt_object_class == CKO_PRIVATE_KEY;
                    ^
This commit is contained in:
Ludovic Rousseau 2016-02-29 18:05:17 +01:00
parent 08529c91ee
commit d929532b63
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/pkcs11-tool.c
View File

@ -2018,8 +2018,8 @@ static int write_object(CK_SESSION_HANDLE session)
#endif
}
if (opt_object_class == CKO_PRIVATE_KEY || opt_object_class == CKO_PUBLIC_KEY) {
int is_private = opt_object_class == CKO_PRIVATE_KEY;
#ifdef ENABLE_OPENSSL
int is_private = opt_object_class == CKO_PRIVATE_KEY;
int rv;
rv = do_read_key(contents, contents_len, is_private, &evp_key);
@ -2647,7 +2647,6 @@ derive_key(CK_SLOT_ID slot, CK_SESSION_HANDLE session, CK_OBJECT_HANDLE key)
CK_BBOOL true = TRUE;
CK_BBOOL false = FALSE;
CK_OBJECT_HANDLE newkey = 0;
CK_ECDH1_DERIVE_PARAMS ecdh_parms;
CK_RV rv;
int fd, r;
CK_ATTRIBUTE newkey_template[] = {
@ -2672,6 +2671,7 @@ derive_key(CK_SLOT_ID slot, CK_SESSION_HANDLE session, CK_OBJECT_HANDLE key)
case CKM_ECDH1_DERIVE:
/* Use OpenSSL to read the other public key, and get the raw verion */
{
CK_ECDH1_DERIVE_PARAMS ecdh_parms;
unsigned char buf[512];
int len;
BIO *bio_in = NULL;