From: Nikos Mavrogiannopoulos Date: Mon, 4 Feb 2013 00:55:43 +0000 (+0100) Subject: corrected typo X-Git-Tag: gnutls_3_1_7~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b58b14fcda025f42639225969bb387c34d476d40;p=thirdparty%2Fgnutls.git corrected typo --- 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)