リセット処理、バグ修正

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_eFuse@151 ff987cc8-cf2f-4642-8568-d52cce064691
This commit is contained in:
kubodera_yuichi 2010-01-07 04:56:23 +00:00
parent 3c03a3110a
commit 501f46af36

View File

@ -161,6 +161,7 @@ const NFKM_KeyIdent hsmEcdsaPubkeyidentProd = { (char*)"simple", (char*)"nct2-pu
int hsm_ecdsa_load_keypair( NFKM_KeyIdent privKeyident, M_KeyID *privKeyid,
NFKM_KeyIdent pubKeyident, M_KeyID *pubKeyid );
#define EXE_AUTH_OK
// init HSM
int hsm_initialize( void )
{
@ -318,8 +319,8 @@ int hsm_reset_module( void )
// モジュールの状態確認
cmd.cmd = Cmd_NewEnquiry;
cmd.args.newenquiry.module = HSM_MODULE_ID;
cmd.args.newenquiry.version = EnqVer_Six;
cmd.args.newenquiry.module = HSM_MODULE_ID;
ret_code = NFastApp_Transact( connection, NULL, &cmd, &reply, NULL );
if ( ret_code != CR_GENID_SUCCESS )
{
@ -360,9 +361,7 @@ int hsm_reset_module( void )
}
} // 復旧処理
NFastApp_Free_Command( handle, NULL, NULL, &cmd );
NFastApp_Free_Reply( handle, NULL, NULL, &reply );
memset( &cmd, 0, sizeof( cmd ) );
memset( &reply, 0, sizeof( reply ) );
@ -382,11 +381,8 @@ int hsm_reset_module( void )
return ret_code;
}
NFastApp_Free_Command( handle, NULL, NULL, &cmd );
NFastApp_Free_Reply( handle, NULL, NULL, &reply );
memset( &cmd, 0, sizeof( cmd ) );
memset( &reply, 0, sizeof( reply ) );
memset( &reply, 0, sizeof( reply ) );;
// モジュールの状態を再度確認
cmd.cmd = Cmd_NewEnquiry;
@ -413,7 +409,7 @@ int hsm_reset_module( void )
}
// 切断
ret_code = NFastApp_Disconnect( hsmConnection, NULL );
ret_code = NFastApp_Disconnect( connection, NULL );
if ( ret_code != CR_GENID_SUCCESS )
{
SetErrorInfo( __FUNCTION__, __LINE__ );