@@ -191,157 +191,157 @@ struct C_DeriveKey_nsc_args {
191191 CK_OBJECT_HANDLE_PTR phKey ;
192192};
193193
194- CK_RV __attribute__(( cmse_nonsecure_entry )) C_Initialize_nsc_call (CK_VOID_PTR pInitArgs );
194+ CK_RV CSME_NSE_API C_Initialize_nsc_call (CK_VOID_PTR pInitArgs );
195195
196- CK_RV __attribute__(( cmse_nonsecure_entry )) C_Finalize_nsc_call (CK_VOID_PTR pReserved );
196+ CK_RV CSME_NSE_API C_Finalize_nsc_call (CK_VOID_PTR pReserved );
197197
198- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GetInfo_nsc_call (CK_INFO_PTR pInfo );
199- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GetFunctionList_nsc_call (CK_FUNCTION_LIST_PTR_PTR ppFunctionList );
198+ CK_RV CSME_NSE_API C_GetInfo_nsc_call (CK_INFO_PTR pInfo );
199+ CK_RV CSME_NSE_API C_GetFunctionList_nsc_call (CK_FUNCTION_LIST_PTR_PTR ppFunctionList );
200200
201- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GetSlotList_nsc_call (CK_BBOOL tokenPresent , CK_SLOT_ID_PTR pSlotList , CK_ULONG_PTR pulCount );
201+ CK_RV CSME_NSE_API C_GetSlotList_nsc_call (CK_BBOOL tokenPresent , CK_SLOT_ID_PTR pSlotList , CK_ULONG_PTR pulCount );
202202
203- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GetSlotInfo_nsc_call (CK_SLOT_ID slotID , CK_SLOT_INFO_PTR pInfo );
203+ CK_RV CSME_NSE_API C_GetSlotInfo_nsc_call (CK_SLOT_ID slotID , CK_SLOT_INFO_PTR pInfo );
204204
205- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GetTokenInfo_nsc_call (CK_SLOT_ID slotID , CK_TOKEN_INFO_PTR pInfo );
205+ CK_RV CSME_NSE_API C_GetTokenInfo_nsc_call (CK_SLOT_ID slotID , CK_TOKEN_INFO_PTR pInfo );
206206
207- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GetMechanismList_nsc_call (CK_SLOT_ID slotID , CK_MECHANISM_TYPE_PTR pMechanismList , CK_ULONG_PTR pulCount );
207+ CK_RV CSME_NSE_API C_GetMechanismList_nsc_call (CK_SLOT_ID slotID , CK_MECHANISM_TYPE_PTR pMechanismList , CK_ULONG_PTR pulCount );
208208
209- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GetMechanismInfo_nsc_call (CK_SLOT_ID slotID , CK_MECHANISM_TYPE type , CK_MECHANISM_INFO_PTR pInfo );
209+ CK_RV CSME_NSE_API C_GetMechanismInfo_nsc_call (CK_SLOT_ID slotID , CK_MECHANISM_TYPE type , CK_MECHANISM_INFO_PTR pInfo );
210210
211- CK_RV __attribute__(( cmse_nonsecure_entry )) C_InitToken_nsc_call (CK_SLOT_ID slotID , CK_UTF8CHAR_PTR pPin , CK_ULONG ulPinLen , CK_UTF8CHAR_PTR pLabel );
211+ CK_RV CSME_NSE_API C_InitToken_nsc_call (CK_SLOT_ID slotID , CK_UTF8CHAR_PTR pPin , CK_ULONG ulPinLen , CK_UTF8CHAR_PTR pLabel );
212212
213- CK_RV __attribute__(( cmse_nonsecure_entry )) C_InitPIN_nsc_call (CK_SESSION_HANDLE hSession , CK_UTF8CHAR_PTR pPin , CK_ULONG ulPinLen );
213+ CK_RV CSME_NSE_API C_InitPIN_nsc_call (CK_SESSION_HANDLE hSession , CK_UTF8CHAR_PTR pPin , CK_ULONG ulPinLen );
214214
215215
216- CK_RV __attribute__(( cmse_nonsecure_entry )) C_SetPIN_nsc_call (struct C_SetPIN_nsc_args * args );
216+ CK_RV CSME_NSE_API C_SetPIN_nsc_call (struct C_SetPIN_nsc_args * args );
217217
218218
219- CK_RV __attribute__(( cmse_nonsecure_entry )) C_OpenSession_nsc_call (struct C_OpenSession_nsc_args * args );
220- CK_RV __attribute__(( cmse_nonsecure_entry )) C_CloseSession_nsc_call (CK_SESSION_HANDLE hSession );
219+ CK_RV CSME_NSE_API C_OpenSession_nsc_call (struct C_OpenSession_nsc_args * args );
220+ CK_RV CSME_NSE_API C_CloseSession_nsc_call (CK_SESSION_HANDLE hSession );
221221
222- CK_RV __attribute__(( cmse_nonsecure_entry )) C_CloseAllSessions_nsc_call (CK_SLOT_ID slotID );
222+ CK_RV CSME_NSE_API C_CloseAllSessions_nsc_call (CK_SLOT_ID slotID );
223223
224224
225- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GetSessionInfo_nsc_call (CK_SESSION_HANDLE hSession , CK_SESSION_INFO_PTR pInfo );
226- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GetOperationState_nsc_call (
225+ CK_RV CSME_NSE_API C_GetSessionInfo_nsc_call (CK_SESSION_HANDLE hSession , CK_SESSION_INFO_PTR pInfo );
226+ CK_RV CSME_NSE_API C_GetOperationState_nsc_call (
227227 CK_SESSION_HANDLE hSession ,
228228 CK_BYTE_PTR pOperationState ,
229229 CK_ULONG_PTR pulOperationStateLen );
230- CK_RV __attribute__(( cmse_nonsecure_entry )) C_SetOperationState_nsc_call (struct C_SetOperationState_nsc_args * args );
231- CK_RV __attribute__(( cmse_nonsecure_entry )) C_Login_nsc_call (CK_SESSION_HANDLE hSession , CK_USER_TYPE userType ,
230+ CK_RV CSME_NSE_API C_SetOperationState_nsc_call (struct C_SetOperationState_nsc_args * args );
231+ CK_RV CSME_NSE_API C_Login_nsc_call (CK_SESSION_HANDLE hSession , CK_USER_TYPE userType ,
232232 CK_UTF8CHAR_PTR pPin , CK_ULONG ulPinLen );
233- CK_RV __attribute__(( cmse_nonsecure_entry )) C_Logout_nsc_call (CK_SESSION_HANDLE hSession );
233+ CK_RV CSME_NSE_API C_Logout_nsc_call (CK_SESSION_HANDLE hSession );
234234
235- CK_RV __attribute__(( cmse_nonsecure_entry )) C_CreateObject_nsc_call (CK_SESSION_HANDLE hSession ,
235+ CK_RV CSME_NSE_API C_CreateObject_nsc_call (CK_SESSION_HANDLE hSession ,
236236 CK_ATTRIBUTE_PTR pTemplate , CK_ULONG ulCount ,
237237 CK_OBJECT_HANDLE_PTR phObject );
238- CK_RV __attribute__(( cmse_nonsecure_entry )) C_DestroyObject_nsc_call (CK_SESSION_HANDLE hSession ,
238+ CK_RV CSME_NSE_API C_DestroyObject_nsc_call (CK_SESSION_HANDLE hSession ,
239239 CK_OBJECT_HANDLE hObject );
240- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GetObjectSize_nsc_call (CK_SESSION_HANDLE hSession ,
240+ CK_RV CSME_NSE_API C_GetObjectSize_nsc_call (CK_SESSION_HANDLE hSession ,
241241 CK_OBJECT_HANDLE hObject , CK_ULONG_PTR pulSize );
242- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GetAttributeValue_nsc_call (CK_SESSION_HANDLE hSession ,
242+ CK_RV CSME_NSE_API C_GetAttributeValue_nsc_call (CK_SESSION_HANDLE hSession ,
243243 CK_OBJECT_HANDLE hObject ,
244244 CK_ATTRIBUTE_PTR pTemplate , CK_ULONG ulCount );
245- CK_RV __attribute__(( cmse_nonsecure_entry )) C_SetAttributeValue_nsc_call (CK_SESSION_HANDLE hSession ,
245+ CK_RV CSME_NSE_API C_SetAttributeValue_nsc_call (CK_SESSION_HANDLE hSession ,
246246 CK_OBJECT_HANDLE hObject ,
247247 CK_ATTRIBUTE_PTR pTemplate , CK_ULONG ulCount );
248- CK_RV __attribute__(( cmse_nonsecure_entry )) C_FindObjectsInit_nsc_call (CK_SESSION_HANDLE hSession ,
248+ CK_RV CSME_NSE_API C_FindObjectsInit_nsc_call (CK_SESSION_HANDLE hSession ,
249249 CK_ATTRIBUTE_PTR pTemplate , CK_ULONG ulCount );
250- CK_RV __attribute__(( cmse_nonsecure_entry )) C_FindObjects_nsc_call (CK_SESSION_HANDLE hSession ,
250+ CK_RV CSME_NSE_API C_FindObjects_nsc_call (CK_SESSION_HANDLE hSession ,
251251 CK_OBJECT_HANDLE_PTR phObject ,
252252 CK_ULONG ulMaxObjectCount ,
253253 CK_ULONG_PTR pulObjectCount );
254254
255- CK_RV __attribute__(( cmse_nonsecure_entry )) C_CopyObject_nsc_call (struct C_CopyObject_nsc_args * args );
255+ CK_RV CSME_NSE_API C_CopyObject_nsc_call (struct C_CopyObject_nsc_args * args );
256256
257- CK_RV __attribute__(( cmse_nonsecure_entry )) C_FindObjectsFinal_nsc_call (CK_SESSION_HANDLE hSession );
257+ CK_RV CSME_NSE_API C_FindObjectsFinal_nsc_call (CK_SESSION_HANDLE hSession );
258258
259- CK_RV __attribute__(( cmse_nonsecure_entry )) C_EncryptInit_nsc_call (CK_SESSION_HANDLE hSession ,
259+ CK_RV CSME_NSE_API C_EncryptInit_nsc_call (CK_SESSION_HANDLE hSession ,
260260 CK_MECHANISM_PTR pMechanism , CK_OBJECT_HANDLE hKey );
261- CK_RV __attribute__(( cmse_nonsecure_entry )) C_Encrypt_nsc_call (struct C_Encrypt_nsc_args * args );
261+ CK_RV CSME_NSE_API C_Encrypt_nsc_call (struct C_Encrypt_nsc_args * args );
262262
263263
264- CK_RV __attribute__(( cmse_nonsecure_entry )) C_EncryptUpdate_nsc_call (struct C_EncryptUpdate_nsc_args * args );
264+ CK_RV CSME_NSE_API C_EncryptUpdate_nsc_call (struct C_EncryptUpdate_nsc_args * args );
265265
266- CK_RV __attribute__(( cmse_nonsecure_entry )) C_EncryptFinal_nsc_call (CK_SESSION_HANDLE hSession ,
266+ CK_RV CSME_NSE_API C_EncryptFinal_nsc_call (CK_SESSION_HANDLE hSession ,
267267 CK_BYTE_PTR pLastEncryptedPart ,
268268 CK_ULONG_PTR pulLastEncryptedPartLen );
269- CK_RV __attribute__(( cmse_nonsecure_entry )) C_DecryptInit_nsc_call (CK_SESSION_HANDLE hSession ,
269+ CK_RV CSME_NSE_API C_DecryptInit_nsc_call (CK_SESSION_HANDLE hSession ,
270270 CK_MECHANISM_PTR pMechanism , CK_OBJECT_HANDLE hKey );
271- CK_RV __attribute__(( cmse_nonsecure_entry )) C_Decrypt_nsc_call (struct C_Decrypt_nsc_args * args );
272- CK_RV __attribute__(( cmse_nonsecure_entry )) C_DecryptUpdate_nsc_call (struct C_DecryptUpdate_nsc_args * args );
271+ CK_RV CSME_NSE_API C_Decrypt_nsc_call (struct C_Decrypt_nsc_args * args );
272+ CK_RV CSME_NSE_API C_DecryptUpdate_nsc_call (struct C_DecryptUpdate_nsc_args * args );
273273
274274
275- CK_RV __attribute__(( cmse_nonsecure_entry )) C_DecryptFinal_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pLastPart ,
275+ CK_RV CSME_NSE_API C_DecryptFinal_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pLastPart ,
276276 CK_ULONG_PTR pulLastPartLen );
277- CK_RV __attribute__(( cmse_nonsecure_entry )) C_DigestInit_nsc_call (CK_SESSION_HANDLE hSession ,
277+ CK_RV CSME_NSE_API C_DigestInit_nsc_call (CK_SESSION_HANDLE hSession ,
278278 CK_MECHANISM_PTR pMechanism );
279- CK_RV __attribute__(( cmse_nonsecure_entry )) C_Digest_nsc_call (struct C_Digest_nsc_args * args );
280- CK_RV __attribute__(( cmse_nonsecure_entry )) C_DigestUpdate_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pPart , CK_ULONG ulPartLen );
281- CK_RV __attribute__(( cmse_nonsecure_entry )) C_DigestKey_nsc_call (CK_SESSION_HANDLE hSession , CK_OBJECT_HANDLE hKey );
279+ CK_RV CSME_NSE_API C_Digest_nsc_call (struct C_Digest_nsc_args * args );
280+ CK_RV CSME_NSE_API C_DigestUpdate_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pPart , CK_ULONG ulPartLen );
281+ CK_RV CSME_NSE_API C_DigestKey_nsc_call (CK_SESSION_HANDLE hSession , CK_OBJECT_HANDLE hKey );
282282
283283
284- CK_RV __attribute__(( cmse_nonsecure_entry )) C_DigestFinal_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pDigest , CK_ULONG_PTR pulDigestLen );
284+ CK_RV CSME_NSE_API C_DigestFinal_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pDigest , CK_ULONG_PTR pulDigestLen );
285285
286286
287- CK_RV __attribute__(( cmse_nonsecure_entry )) C_SignInit_nsc_call (CK_SESSION_HANDLE hSession , CK_MECHANISM_PTR pMechanism , CK_OBJECT_HANDLE hKey );
287+ CK_RV CSME_NSE_API C_SignInit_nsc_call (CK_SESSION_HANDLE hSession , CK_MECHANISM_PTR pMechanism , CK_OBJECT_HANDLE hKey );
288288
289- CK_RV __attribute__(( cmse_nonsecure_entry )) C_Sign_nsc_call (struct C_Sign_nsc_args * args );
290- CK_RV __attribute__(( cmse_nonsecure_entry )) C_SignUpdate_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pPart , CK_ULONG ulPartLen );
289+ CK_RV CSME_NSE_API C_Sign_nsc_call (struct C_Sign_nsc_args * args );
290+ CK_RV CSME_NSE_API C_SignUpdate_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pPart , CK_ULONG ulPartLen );
291291
292- CK_RV __attribute__(( cmse_nonsecure_entry )) C_SignFinal_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pSignature , CK_ULONG_PTR pulSignatureLen );
292+ CK_RV CSME_NSE_API C_SignFinal_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pSignature , CK_ULONG_PTR pulSignatureLen );
293293
294- CK_RV __attribute__(( cmse_nonsecure_entry )) C_SignRecoverInit_nsc_call (CK_SESSION_HANDLE hSession , CK_MECHANISM_PTR pMechanism , CK_OBJECT_HANDLE hKey );
294+ CK_RV CSME_NSE_API C_SignRecoverInit_nsc_call (CK_SESSION_HANDLE hSession , CK_MECHANISM_PTR pMechanism , CK_OBJECT_HANDLE hKey );
295295
296- CK_RV __attribute__(( cmse_nonsecure_entry )) C_SignRecover_nsc_call (struct C_SignRecover_nsc_args * args );
297- CK_RV __attribute__(( cmse_nonsecure_entry )) C_VerifyInit_nsc_call (CK_SESSION_HANDLE hSession ,
296+ CK_RV CSME_NSE_API C_SignRecover_nsc_call (struct C_SignRecover_nsc_args * args );
297+ CK_RV CSME_NSE_API C_VerifyInit_nsc_call (CK_SESSION_HANDLE hSession ,
298298 CK_MECHANISM_PTR pMechanism , CK_OBJECT_HANDLE hKey );
299299
300- CK_RV __attribute__(( cmse_nonsecure_entry )) C_Verify_nsc_call (struct C_Verify_nsc_args * args );
300+ CK_RV CSME_NSE_API C_Verify_nsc_call (struct C_Verify_nsc_args * args );
301301
302- CK_RV __attribute__(( cmse_nonsecure_entry )) C_VerifyUpdate_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pPart ,
302+ CK_RV CSME_NSE_API C_VerifyUpdate_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pPart ,
303303 CK_ULONG ulPartLen );
304- CK_RV __attribute__(( cmse_nonsecure_entry )) C_VerifyFinal_nsc_call (CK_SESSION_HANDLE hSession ,
304+ CK_RV CSME_NSE_API C_VerifyFinal_nsc_call (CK_SESSION_HANDLE hSession ,
305305 CK_BYTE_PTR pSignature , CK_ULONG ulSignatureLen );
306306
307307
308- CK_RV __attribute__(( cmse_nonsecure_entry )) C_VerifyRecoverInit_nsc_call (CK_SESSION_HANDLE hSession ,
308+ CK_RV CSME_NSE_API C_VerifyRecoverInit_nsc_call (CK_SESSION_HANDLE hSession ,
309309 CK_MECHANISM_PTR pMechanism ,
310310 CK_OBJECT_HANDLE hKey );
311- CK_RV __attribute__(( cmse_nonsecure_entry )) C_VerifyRecover_nsc_call (struct C_VerifyRecover_nsc_args * args );
311+ CK_RV CSME_NSE_API C_VerifyRecover_nsc_call (struct C_VerifyRecover_nsc_args * args );
312312
313313
314- CK_RV __attribute__(( cmse_nonsecure_entry )) C_DigestEncryptUpdate_nsc_call (struct C_DigestEncryptUpdate_nsc_args * args );
314+ CK_RV CSME_NSE_API C_DigestEncryptUpdate_nsc_call (struct C_DigestEncryptUpdate_nsc_args * args );
315315
316- CK_RV __attribute__(( cmse_nonsecure_entry )) C_DecryptDigestUpdate_nsc_call (struct C_DecryptDigestUpdate_nsc_args * args );
316+ CK_RV CSME_NSE_API C_DecryptDigestUpdate_nsc_call (struct C_DecryptDigestUpdate_nsc_args * args );
317317
318- CK_RV __attribute__(( cmse_nonsecure_entry )) C_SignEncryptUpdate_nsc_call (struct C_SignEncryptUpdate_nsc_args * args );
318+ CK_RV CSME_NSE_API C_SignEncryptUpdate_nsc_call (struct C_SignEncryptUpdate_nsc_args * args );
319319
320320
321- CK_RV __attribute__(( cmse_nonsecure_entry )) C_DecryptVerifyUpdate_nsc_call (struct C_DecryptVerifyUpdate_nsc_args * args );
321+ CK_RV CSME_NSE_API C_DecryptVerifyUpdate_nsc_call (struct C_DecryptVerifyUpdate_nsc_args * args );
322322
323323
324- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GenerateKey_nsc_call (struct C_GenerateKey_nsc_args * args );
324+ CK_RV CSME_NSE_API C_GenerateKey_nsc_call (struct C_GenerateKey_nsc_args * args );
325325
326326
327- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GenerateKeyPair_nsc_call (struct C_GenerateKeyPair_nsc_args * args );
327+ CK_RV CSME_NSE_API C_GenerateKeyPair_nsc_call (struct C_GenerateKeyPair_nsc_args * args );
328328
329329
330- CK_RV __attribute__(( cmse_nonsecure_entry )) C_WrapKey_nsc_call (struct C_WrapKey_nsc_args * args );
330+ CK_RV CSME_NSE_API C_WrapKey_nsc_call (struct C_WrapKey_nsc_args * args );
331331
332332
333- CK_RV __attribute__(( cmse_nonsecure_entry )) C_UnwrapKey_nsc_call (struct C_UnwrapKey_nsc_args * args );
333+ CK_RV CSME_NSE_API C_UnwrapKey_nsc_call (struct C_UnwrapKey_nsc_args * args );
334334
335335
336- CK_RV __attribute__(( cmse_nonsecure_entry )) C_DeriveKey_nsc_call (struct C_DeriveKey_nsc_args * args );
337- CK_RV __attribute__(( cmse_nonsecure_entry )) C_SeedRandom_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pSeed , CK_ULONG ulSeedLen );
336+ CK_RV CSME_NSE_API C_DeriveKey_nsc_call (struct C_DeriveKey_nsc_args * args );
337+ CK_RV CSME_NSE_API C_SeedRandom_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pSeed , CK_ULONG ulSeedLen );
338338
339- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GenerateRandom_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pRandomData , CK_ULONG ulRandomLen );
340- CK_RV __attribute__(( cmse_nonsecure_entry )) C_GetFunctionStatus_nsc_call (CK_SESSION_HANDLE hSession );
339+ CK_RV CSME_NSE_API C_GenerateRandom_nsc_call (CK_SESSION_HANDLE hSession , CK_BYTE_PTR pRandomData , CK_ULONG ulRandomLen );
340+ CK_RV CSME_NSE_API C_GetFunctionStatus_nsc_call (CK_SESSION_HANDLE hSession );
341341
342342
343- CK_RV __attribute__(( cmse_nonsecure_entry )) C_CancelFunction_nsc_call (CK_SESSION_HANDLE hSession );
344- CK_RV __attribute__(( cmse_nonsecure_entry )) C_WaitForSlotEvent_nsc_call (CK_FLAGS flags , CK_SLOT_ID_PTR pSlot , CK_VOID_PTR pReserved );
343+ CK_RV CSME_NSE_API C_CancelFunction_nsc_call (CK_SESSION_HANDLE hSession );
344+ CK_RV CSME_NSE_API C_WaitForSlotEvent_nsc_call (CK_FLAGS flags , CK_SLOT_ID_PTR pSlot , CK_VOID_PTR pReserved );
345345
346346#endif /* SECURE_PKCS11 */
347347#endif /* !WOLFBOOT_PKCS11_H */
0 commit comments