diff --git a/cr_hsm_code.c b/cr_hsm_code.c index 1782858..2aedc6b 100644 --- a/cr_hsm_code.c +++ b/cr_hsm_code.c @@ -134,8 +134,6 @@ NFast_AppHandle hsmHandle; NFastApp_Connection hsmConnection; NFKM_WorldInfo *hsmWorld = NULL; // allocate -RQCard hsmCard; -RQCard_FIPS hsmFips; M_KeyID hsmLtid; NFKM_ModuleInfo *hsmModuleinfo = NULL; M_ByteBlock *hsmBlobptr = NULL; @@ -201,34 +199,6 @@ int hsm_initialize( void ) return ret_code; } - // TODO:この辺りのOCSカード処理?は必要? - -#if 0 - // init Card-Loading Lib(RQCard) - ret_code = RQCard_init( &hsmCard, hsmHandle, hsmConnection, hsmWorld, NULL ); - if ( ret_code != CR_GENID_SUCCESS ) - { - printf( "error(%d) : RQCard_init\n", ret_code ); - return ret_code; - } - - // init FIPS state - ret_code = RQCard_fips_init( &hsmCard, &hsmFips ); - if ( ret_code != CR_GENID_SUCCESS ) - { - printf( "error(%d) : RQCard_fips_init\n", ret_code ); - return ret_code; - } - - // select Card-Auth UI - ret_code = RQCard_ui_scroll( &hsmCard ); - if ( ret_code != CR_GENID_SUCCESS ) - { - printf( "error(%d) : RQCard_ui_scroll\n", ret_code ); - return ret_code; - } -#endif - #ifdef ENCRYPT_AES // load aes dev key ret_code = hsm_aes_load_key( hsmAesKeyidentDev, &hsmAesKeyidDev ); @@ -264,9 +234,6 @@ int hsm_initialize( void ) void hsm_finalize( void ) { - RQCard_fips_free( &hsmCard, &hsmFips ); - RQCard_destroy( &hsmCard ); - NFKM_freeinfo( hsmHandle, &hsmWorld, NULL ); NFastApp_Disconnect( hsmConnection, NULL ); NFastApp_Finish( hsmHandle, NULL );