From 3f7f2b633b8d3a992308cfe37f0f4ae818b500f5 Mon Sep 17 00:00:00 2001 From: Gabriel Kihlman Date: Wed, 6 Mar 2019 14:31:04 +0100 Subject: [PATCH 1/3] Remove duplicate check on op_info.type != YKCS11_SIGN --- ykcs11/ykcs11.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ykcs11/ykcs11.c b/ykcs11/ykcs11.c index f698670..78b13ec 100644 --- a/ykcs11/ykcs11.c +++ b/ykcs11/ykcs11.c @@ -1863,12 +1863,6 @@ CK_DEFINE_FUNCTION(CK_RV, C_Sign)( goto sign_out; } - if (op_info.type != YKCS11_SIGN) { - DBG("Operation not initialized"); - rv = CKR_OPERATION_NOT_INITIALIZED; - goto sign_out; - } - if (session.info.state == CKS_RO_PUBLIC_SESSION || session.info.state == CKS_RW_PUBLIC_SESSION) { DBG("User is not logged in"); From f60d2d4ff8a024070bcb22cf360f24b5dd7e34fb Mon Sep 17 00:00:00 2001 From: Gabriel Kihlman Date: Wed, 6 Mar 2019 14:32:42 +0100 Subject: [PATCH 2/3] Do not assign variable twice --- ykcs11/ykcs11.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/ykcs11/ykcs11.c b/ykcs11/ykcs11.c index 78b13ec..c603003 100644 --- a/ykcs11/ykcs11.c +++ b/ykcs11/ykcs11.c @@ -1968,8 +1968,6 @@ CK_DEFINE_FUNCTION(CK_RV, C_Sign)( memcpy(pSignature, op_info.buf, *pulSignatureLen); - op_info.type = YKCS11_NOOP; - rv = CKR_OK; sign_out: From bc2f161c51510ea5e2a5d31e05c9f4d59f5bb949 Mon Sep 17 00:00:00 2001 From: Gabriel Kihlman Date: Wed, 6 Mar 2019 15:16:56 +0100 Subject: [PATCH 3/3] Initialize buf to 0 to make a code scanner happy --- ykcs11/ykcs11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ykcs11/ykcs11.c b/ykcs11/ykcs11.c index c603003..3ce91a9 100644 --- a/ykcs11/ykcs11.c +++ b/ykcs11/ykcs11.c @@ -1695,7 +1695,7 @@ CK_DEFINE_FUNCTION(CK_RV, C_SignInit)( CK_KEY_TYPE type = 0; CK_ULONG key_len = 0; CK_BYTE exp[3]; - CK_BYTE buf[1024]; + CK_BYTE buf[1024] = {0}; CK_ATTRIBUTE template[] = { {CKA_KEY_TYPE, &type, sizeof(type)}, {CKA_MODULUS_BITS, &key_len, sizeof(key_len)},