pkcs11-tool.c: fix 2 compiler warnings
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:
parent
08529c91ee
commit
d929532b63
@ -2018,8 +2018,8 @@ static int write_object(CK_SESSION_HANDLE session)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
if (opt_object_class == CKO_PRIVATE_KEY || opt_object_class == CKO_PUBLIC_KEY) {
|
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
|
#ifdef ENABLE_OPENSSL
|
||||||
|
int is_private = opt_object_class == CKO_PRIVATE_KEY;
|
||||||
int rv;
|
int rv;
|
||||||
|
|
||||||
rv = do_read_key(contents, contents_len, is_private, &evp_key);
|
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 true = TRUE;
|
||||||
CK_BBOOL false = FALSE;
|
CK_BBOOL false = FALSE;
|
||||||
CK_OBJECT_HANDLE newkey = 0;
|
CK_OBJECT_HANDLE newkey = 0;
|
||||||
CK_ECDH1_DERIVE_PARAMS ecdh_parms;
|
|
||||||
CK_RV rv;
|
CK_RV rv;
|
||||||
int fd, r;
|
int fd, r;
|
||||||
CK_ATTRIBUTE newkey_template[] = {
|
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:
|
case CKM_ECDH1_DERIVE:
|
||||||
/* Use OpenSSL to read the other public key, and get the raw verion */
|
/* Use OpenSSL to read the other public key, and get the raw verion */
|
||||||
{
|
{
|
||||||
|
CK_ECDH1_DERIVE_PARAMS ecdh_parms;
|
||||||
unsigned char buf[512];
|
unsigned char buf[512];
|
||||||
int len;
|
int len;
|
||||||
BIO *bio_in = NULL;
|
BIO *bio_in = NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user