[Cryptech-Commits] [sw/pkcs11] branch master updated: Clean up old unused variable warnings.

git at cryptech.is git at cryptech.is
Wed Jul 18 12:41:57 UTC 2018


This is an automated email from the git hooks/post-receive script.

sra at hactrn.net pushed a commit to branch master
in repository sw/pkcs11.

The following commit(s) were added to refs/heads/master by this push:
     new 0e442a9  Clean up old unused variable warnings.
0e442a9 is described below

commit 0e442a9ac57df33de87b71e95c27cb0887c3961f
Author: Rob Austein <sra at hactrn.net>
AuthorDate: Wed Jul 18 08:40:13 2018 -0400

    Clean up old unused variable warnings.
---
 pkcs11.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkcs11.c b/pkcs11.c
index 06205b6..6e891e6 100644
--- a/pkcs11.c
+++ b/pkcs11.c
@@ -1821,8 +1821,8 @@ static CK_RV p11_check_keypair_attributes(const p11_session_t *session,
 
   *public_flags = *private_flags = 0;
 
-  const CK_BBOOL * public_cka_private = NULL, * public_cka_token = NULL;
-  const CK_BBOOL *private_cka_private = NULL, *private_cka_token = NULL;
+  const CK_BBOOL * public_cka_private = NULL;
+  const CK_BBOOL *private_cka_private = NULL;
   const CK_BBOOL *private_cka_extractable = NULL;
 
   /*
@@ -1838,9 +1838,6 @@ static CK_RV p11_check_keypair_attributes(const p11_session_t *session,
                                    P11_DESCRIPTOR_FORBIDDEN_BY_GENERATE)) != CKR_OK)
       goto fail;
 
-    if (type == CKA_TOKEN)
-      public_cka_token = val;
-
     if (type == CKA_PRIVATE)
       public_cka_private = val;
 
@@ -1856,9 +1853,6 @@ static CK_RV p11_check_keypair_attributes(const p11_session_t *session,
                                    P11_DESCRIPTOR_FORBIDDEN_BY_GENERATE)) != CKR_OK)
       goto fail;
 
-    if (type == CKA_TOKEN)
-      private_cka_token = val;
-
     if (type == CKA_PRIVATE)
       private_cka_private = val;
 
@@ -2218,8 +2212,6 @@ static CK_RV p11_check_create_attributes(const p11_session_t *session,
                                          const CK_ULONG ulCount,
                                          const p11_descriptor_t * const descriptor)
 {
-  const CK_BBOOL *cka_private = NULL;
-  const CK_BBOOL *cka_token = NULL;
   CK_RV rv = CKR_OK;
   int i;
 
@@ -2237,12 +2229,6 @@ static CK_RV p11_check_create_attributes(const p11_session_t *session,
     if ((rv = p11_template_check_1(type, val, len, descriptor,
                                    P11_DESCRIPTOR_FORBIDDEN_BY_CREATEOBJECT)) != CKR_OK)
       goto fail;
-
-    if (type == CKA_TOKEN)
-      cka_token = val;
-
-    if (type == CKA_PRIVATE)
-      cka_private = val;
   }
 
   /*

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Commits mailing list