summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2013-02-04 01:55:43 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2013-02-04 01:59:21 +0100
commitb58b14fcda025f42639225969bb387c34d476d40 (patch)
tree59a4fdc2c0cfa81c037ea27e2a5436e323775b77
parent2fe915def9602f1819ea80aa5fbf365a129733a1 (diff)
downloadgnutls-b58b14fcda025f42639225969bb387c34d476d40.tar.gz
corrected typo
-rw-r--r--lib/includes/gnutls/pkcs11.h2
-rw-r--r--lib/pkcs11.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index 3c6cf44dab..5d2e01e07a 100644
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -192,7 +192,7 @@ typedef enum
GNUTLS_PKCS11_OBJ_ATTR_PUBKEY, /* public keys */
GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY, /* private keys */
GNUTLS_PKCS11_OBJ_ATTR_ALL, /* everything! */
- GNUTLS_PKCS11_OBJ_ATTR_TRUSTED_CA, /* CAs */
+ GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED_CA, /* CAs */
} gnutls_pkcs11_obj_attr_t;
/**
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 6ca0a8e7c2..ecddf99304 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -2211,7 +2211,8 @@ find_objs (struct pkcs11_session_info* sinfo,
struct ck_attribute *attr;
ck_object_class_t class = (ck_object_class_t)-1;
ck_certificate_type_t type = (ck_certificate_type_t)-1;
- unsigned int trusted, category;
+ unsigned int trusted;
+ unsigned long category;
ck_rv_t rv;
ck_object_handle_t obj;
unsigned long count;
@@ -2334,9 +2335,9 @@ find_objs (struct pkcs11_session_info* sinfo,
tot_values++;
category = 2;
- a[tot_values].type = CKA_CATEGORY;
+ a[tot_values].type = CKA_CERTIFICATE_CATEGORY;
a[tot_values].value = &category;
- a[tot_values].value_len = sizeof trusted;
+ a[tot_values].value_len = sizeof category;
tot_values++;
}
else if (find_data->flags == GNUTLS_PKCS11_OBJ_ATTR_PUBKEY)