HSMのリセットはHSMユーザしか行えないため、今のところオフに。

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_eFuse@92 ff987cc8-cf2f-4642-8568-d52cce064691
This commit is contained in:
kubodera_yuichi 2009-12-25 02:32:21 +00:00
parent 8fca7addd9
commit 796b29938d
2 changed files with 406 additions and 409 deletions

View File

@ -135,11 +135,14 @@ int cr_print_flag = 0;
// generate_id関数のイニシャライズ // generate_id関数のイニシャライズ
int cr_generate_id_initialize( u8 id_buf[CR_ID_BUF_SIZE] ) int cr_generate_id_initialize( u8 id_buf[CR_ID_BUF_SIZE] )
{ {
int ret_code = CR_GENID_SUCCESS; int ret_code = CR_GENID_INITIALIZE_OK;
// 生成カウンタの初期化 // 生成カウンタの初期化
generatingCount = 0; generatingCount = 0;
// init for error info
InitErrorInfo();
#ifdef USE_HSM #ifdef USE_HSM
ret_code = hsm_initialize(); ret_code = hsm_initialize();
if ( ret_code != CR_GENID_SUCCESS ) if ( ret_code != CR_GENID_SUCCESS )
@ -149,15 +152,13 @@ int cr_generate_id_initialize( u8 id_buf[CR_ID_BUF_SIZE] )
cr_err_buf->errorCode = ret_code; cr_err_buf->errorCode = ret_code;
GetErrorInfo( cr_err_buf->callStack, &cr_err_buf->recordSize ); GetErrorInfo( cr_err_buf->callStack, &cr_err_buf->recordSize );
#ifdef DEBUG_PRINT #ifdef DEBUG_PRINT
printf( "CALL_STACK : %s\n", cr_err_buf->callStack ); printf( "error(%d), CALL_STACK : %s\n", (int)cr_err_buf->errorCode, cr_err_buf->callStack );
#endif #endif
return 0; return 0;
} }
#endif #endif
ret_code = CR_GENID_INITIALIZE_OK; return ret_code;
return ( ret_code );
} // cr_generate_id_initialize } // cr_generate_id_initialize
@ -181,12 +182,6 @@ int cr_generate_id_finalize( void )
return ( ok ); return ( ok );
} // cr_generate_id_finalize } // cr_generate_id_finalize
/*
unsigned long ERR_get_error(void);
id_buf
*/
// generate_id 関数 // generate_id 関数
int cr_generate_id( u32 serial[CR_NUM_OF_SERIAL], u8 id_buf[CR_ID_BUF_SIZE], u8 bondingOption ) int cr_generate_id( u32 serial[CR_NUM_OF_SERIAL], u8 id_buf[CR_ID_BUF_SIZE], u8 bondingOption )
{ {

View File

@ -155,13 +155,15 @@ int hsm_initialize( void )
{ {
int ret_code = CR_GENID_SUCCESS; int ret_code = CR_GENID_SUCCESS;
// TODO: HSMリセットを入れる。 // HSM のリセット処理
#ifdef EXE_AUTH__OK
ret_code = hsm_reset_module(); ret_code = hsm_reset_module();
if ( ret_code != CR_GENID_SUCCESS ) if ( ret_code != CR_GENID_SUCCESS )
{ {
SetErrorInfo( __FUNCTION__, __LINE__ ); SetErrorInfo( __FUNCTION__, __LINE__ );
return ret_code; return ret_code;
} }
#endif
// init HSM // init HSM
ret_code = NFastApp_InitEx( &hsmHandle, NULL, NULL ); ret_code = NFastApp_InitEx( &hsmHandle, NULL, NULL );