From b3e582f8c39acfc82d040ec6be39ef9fa8ef024e Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Tue, 9 Dec 2008 20:13:21 +0000 Subject: Same more fixes after rename. --- p11-capi-rsa.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'p11-capi-rsa.c') 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); -- cgit v1.2.3