Same more fixes after rename.

9 files changed, 23 insertions, 24 deletions

diff --git a/p11-capi-builtin.c b/p11-capi-builtin.c
index 2757cb3..95fd476 100644
--- a/p11-capi-builtin.c
+++ b/p11-capi-builtin.c
@@ -58,7 +58,7 @@ typedef struct _BuiltinMatch
 BuiltinMatch;
 
 static const BuiltinMatch all_builtins[] = {
-	{ (CK_ATTRIBUTE_PTR)&builtin_root, P11c_SLOT_TRUSTED | P11c_SLOT_CA | P11c_SLOT_CERTS },
+	{ (CK_ATTRIBUTE_PTR)&builtin_root, P11C_SLOT_TRUSTED | P11C_SLOT_CA | P11C_SLOT_CERTS },
 	{ NULL, 0 }
 };
 
diff --git a/p11-capi-cert.c b/p11-capi-cert.c
index 960073a..53e198f 100644
--- a/p11-capi-cert.c
+++ b/p11-capi-cert.c
@@ -259,7 +259,7 @@ cert_alloc_data(P11cSession* sess, P11cObject* obj, PCCERT_CONTEXT cert)
 		return NULL;
 	
 	cdata->cert = cert;
-	cdata->is_in_root = (p11c_token_get_flags(sess->slot) & P11c_SLOT_CA) ? TRUE : FALSE;
+	cdata->is_in_root = (p11c_token_get_flags(sess->slot) & P11C_SLOT_CA) ? TRUE : FALSE;
 
 	cdata->base.object = obj->id;
 	cdata->base.data_funcs = &cert_objdata_vtable;
@@ -677,7 +677,7 @@ p11c_cert_find(P11cSession* sess, CK_OBJECT_CLASS cls, CK_ATTRIBUTE_PTR match,
 		return CKR_OK;
 
 	/* Only work with slots that have certificates */
-	if(!(p11c_token_get_flags (sess->slot) & P11c_SLOT_CERTS))
+	if(!(p11c_token_get_flags (sess->slot) & P11C_SLOT_CERTS))
 		return CKR_OK;
 
 	/* 
diff --git a/p11-capi-cert.h b/p11-capi-cert.h
index a19b740..f85d7b3 100644
--- a/p11-capi-cert.h
+++ b/p11-capi-cert.h
@@ -24,7 +24,7 @@
 #include "p11-capi-util.h"
 
 /* Find certificates matching criteria */
-CK_R            p11c_cert_find                         (P11cSession* sess, CK_OBJECT_CLASS cls, 
+CK_RV           p11c_cert_find                         (P11cSession* sess, CK_OBJECT_CLASS cls, 
                                                         CK_ATTRIBUTE_PTR match,  CK_ULONG count, 
                                                         P11cArray* arr);
 
diff --git a/p11-capi-der.c b/p11-capi-der.c
index db69b89..5698dff 100644
--- a/p11-capi-der.c
+++ b/p11-capi-der.c
@@ -135,7 +135,7 @@ p11c_der_read_oid(BYTE* oid_tag, DWORD n_oid_tag)
 	DWORD n_oid;
 
 	/* wasn't an oid */
-	if(P11c_DER_OBJECT_ID != *oid_tag) 
+	if(P11C_DER_OBJECT_ID != *oid_tag) 
 		return NULL;
 
 	oid = p11c_der_unwrap(oid_tag, n_oid_tag, &n_oid, NULL);;
diff --git a/p11-capi-key.c b/p11-capi-key.c
index bda2baf..ed306d4 100644
--- a/p11-capi-key.c
+++ b/p11-capi-key.c
@@ -1022,7 +1022,7 @@ p11c_key_find(P11cSession* sess, CK_OBJECT_CLASS cls,
 	CK_RV ret = CKR_OK;
 
 	/* Is this somewhere we have all keys present? */
-	if(p11c_token_get_flags(sess->slot) & P11c_SLOT_ANYKEY)
+	if(p11c_token_get_flags(sess->slot) & P11C_SLOT_ANYKEY)
 	{
 		if((cls == CKO_PRIVATE_KEY || cls == CKO_ANY) && ret == CKR_OK)
 			ret = find_any_keys(sess, CKO_PRIVATE_KEY, match, count, arr);
diff --git a/p11-capi-object.h b/p11-capi-object.h
index cd08ae9..e884ee1 100644
--- a/p11-capi-object.h
+++ b/p11-capi-object.h
@@ -82,7 +82,7 @@ struct _P11cObjectData
 };
 
 /* Match object data against all the given match attributes */
-CK_BBOO             p11c_object_data_match       (P11cObjectData* objdata, 
+CK_BBOOL            p11c_object_data_match       (P11cObjectData* objdata, 
                                                   CK_ATTRIBUTE_PTR matches, CK_ULONG count);
 
 /* Match a single attribute against object data */
diff --git a/p11-capi-rsa.c b/p11-capi-rsa.c
index 1e22618..18fc4eb 100644
--- a/p11-capi-rsa.c
+++ b/p11-capi-rsa.c
@@ -17,8 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "p11c.h"
-
+#include "p11-capi.h"
 #include "p11-capi-der.h"
 #include "p11-capi-key.h"
 #include "p11-capi-object.h"
@@ -161,7 +160,7 @@ parse_rsa_pkcs_der_hash(CK_BYTE_PTR input, CK_ULONG n_input,
 }
 
 CK_RV
-p11c_rsa_pkcs_sign_init(P11CObjectData *keydata, void** operation)
+p11c_rsa_pkcs_sign_init(P11cObjectData *keydata, void** operation)
 {
 	CRYPT_KEY_PROV_INFO* prov_info;
 
@@ -183,7 +182,7 @@ p11c_rsa_pkcs_sign_perform (CK_BYTE_PTR data, CK_ULONG n_data,
                             void** operation)
 {
 	CRYPT_KEY_PROV_INFO* prov_info;
-	P11CObjectData* keydata;
+	P11cObjectData* keydata;
 	ALG_ID algorithm;
 	BYTE* hash_data;
 	DWORD n_hash_data;
@@ -202,7 +201,7 @@ p11c_rsa_pkcs_sign_perform (CK_BYTE_PTR data, CK_ULONG n_data,
 	if(!data || !n_data)
 		return CKR_ARGUMENTS_BAD;
 
-	keydata = (P11CObjectData*)*operation;
+	keydata = (P11cObjectData*)*operation;
 
 	prov_info = p11c_key_object_data_get_prov_info(keydata);
 	ASSERT(prov_info);
@@ -293,7 +292,7 @@ p11c_rsa_pkcs_sign_cleanup (void* operation)
 
 
 CK_RV
-p11c_rsa_pkcs_decrypt_init(P11CObjectData* keydata, void** operation)
+p11c_rsa_pkcs_decrypt_init(P11cObjectData* keydata, void** operation)
 {
 	CRYPT_KEY_PROV_INFO* prov_info;
 
@@ -315,7 +314,7 @@ p11c_rsa_pkcs_decrypt_perform(CK_BYTE_PTR encdata, CK_ULONG n_encdata,
                               void** operation)
 {
 	CRYPT_KEY_PROV_INFO* prov_info;
-	P11CObjectData* keydata;
+	P11cObjectData* keydata;
 	BOOL capifail;
 	DWORD bits, error;
 	CK_RV ret;
@@ -329,7 +328,7 @@ p11c_rsa_pkcs_decrypt_perform(CK_BYTE_PTR encdata, CK_ULONG n_encdata,
 	ASSERT(encdata);
 	ASSERT(n_encdata);
 
-	keydata = (P11CObjectData*)*operation;
+	keydata = (P11cObjectData*)*operation;
 
 	prov_info = p11c_key_object_data_get_prov_info(keydata);
 	ASSERT(prov_info);
diff --git a/p11-capi-token.c b/p11-capi-token.c
index 13a87d6..f6ef2ca 100644
--- a/p11-capi-token.c
+++ b/p11-capi-token.c
@@ -36,14 +36,14 @@ SlotInfo;
 #define SLOT_OFFSET  0x00001000
 
 static SlotInfo slot_info[] = {
-	{ "My", "Personal Certificates", P11c_SLOT_TRUSTED | P11c_SLOT_CERTS },
-	{ "AddressBook", "Address Book Certificates", P11c_SLOT_CERTS },
-	{ "CA", "Certificate Authorities", P11c_SLOT_CA | P11c_SLOT_CERTS },  
-	{ "Root", "Root Authorities", P11c_SLOT_TRUSTED | P11c_SLOT_CA | P11c_SLOT_CERTS }, 
-	{ "Trust", "Trust", P11c_SLOT_CERTS }, 
-	{ "TrustedPeople", "Trusted People", P11c_SLOT_TRUSTED | P11c_SLOT_CERTS }, 
-	{ "AuthRoot", "Auth Root", P11c_SLOT_CERTS },
-	{ NULL, "All User Keys", P11c_SLOT_ANYKEY }
+	{ "My", "Personal Certificates", P11C_SLOT_TRUSTED | P11C_SLOT_CERTS },
+	{ "AddressBook", "Address Book Certificates", P11C_SLOT_CERTS },
+	{ "CA", "Certificate Authorities", P11C_SLOT_CA | P11C_SLOT_CERTS },  
+	{ "Root", "Root Authorities", P11C_SLOT_TRUSTED | P11C_SLOT_CA | P11C_SLOT_CERTS }, 
+	{ "Trust", "Trust", P11C_SLOT_CERTS }, 
+	{ "TrustedPeople", "Trusted People", P11C_SLOT_TRUSTED | P11C_SLOT_CERTS }, 
+	{ "AuthRoot", "Auth Root", P11C_SLOT_CERTS },
+	{ NULL, "All User Keys", P11C_SLOT_ANYKEY }
 };
 
 #define SLOT_TO_OFFSET(slot) \
diff --git a/p11-capi-trust.c b/p11-capi-trust.c
index e8bab5f..e45106a 100644
--- a/p11-capi-trust.c
+++ b/p11-capi-trust.c
@@ -527,7 +527,7 @@ p11c_trust_find(P11cSession* sess, CK_OBJECT_CLASS cls,
 		return CKR_OK;
 
 	/* Only work with slots that have certificates */
-	if(!(p11c_token_get_flags (sess->slot) & P11c_SLOT_CERTS))
+	if(!(p11c_token_get_flags (sess->slot) & P11C_SLOT_CERTS))
 		return CKR_OK;
 
 	/* Get a list of all certificates */