diff --git a/cr_generate_id.c b/cr_generate_id.c index cee31e8..cfb2fea 100644 --- a/cr_generate_id.c +++ b/cr_generate_id.c @@ -158,7 +158,7 @@ int cr_generate_id_initialize( u8 err_buf[CR_ID_BUF_SIZE] ) return CR_GENID_FAILED; } #endif - + return ret_code; } // cr_generate_id_initialize @@ -375,12 +375,15 @@ end: #ifdef MY_CRYPTO_DEBUG ERR_free_strings(); #endif /* MY_CRYPTO_DEBUG */ + +#if 0 if ( cr_print_flag ) { printf( "hsm alloc counter : %d\n", my_hsm_get_alloc_counter() ); printf( "hsmbn alloc counter : %d\n", my_bignum_get_alloc_counter() ); printf( "miya alloc counter : %d\n", cr_mem_get_counter() ); } +#endif return ret_code; /* success */ } diff --git a/cr_hsm_code.c b/cr_hsm_code.c index 30fb739..abefa29 100644 --- a/cr_hsm_code.c +++ b/cr_hsm_code.c @@ -155,7 +155,9 @@ M_KeyID hsmEcdsaPrivkeyidDev, hsmEcdsaPubkeyidDev; M_KeyID hsmEcdsaPrivkeyidProd, hsmEcdsaPubkeyidProd; const NFKM_KeyIdent hsmEcdsaPrivkeyidentDev = { (char*)"simple", (char*)"nct2-priv-dev" }; +const NFKM_KeyIdent hsmEcdsaPubkeyidentDev = { (char*)"simple", (char*)"nct2-pub-dev" }; const NFKM_KeyIdent hsmEcdsaPrivkeyidentProd = { (char*)"simple", (char*)"nct2-priv-prod" }; +const NFKM_KeyIdent hsmEcdsaPubkeyidentProd = { (char*)"simple", (char*)"nct2-pub-prod" }; int hsm_ecdsa_load_keypair( NFKM_KeyIdent privKeyident, M_KeyID *privKeyid, NFKM_KeyIdent pubKeyident, M_KeyID *pubKeyid ); @@ -212,7 +214,7 @@ int hsm_initialize( void ) SetErrorInfo( __FUNCTION__, __LINE__ ); return ret_code; } - + #ifdef ENCRYPT_AES // load aes dev key ret_code = hsm_aes_load_key( hsmAesKeyidentDev, &hsmAesKeyidDev ); @@ -249,7 +251,7 @@ int hsm_initialize( void ) // load ecdsa dev keypair ret_code = hsm_ecdsa_load_keypair( hsmEcdsaPrivkeyidentDev, &hsmEcdsaPrivkeyidDev, - *(NFKM_KeyIdent*)NULL, &hsmEcdsaPubkeyidDev ); + hsmEcdsaPubkeyidentDev, &hsmEcdsaPubkeyidDev ); if ( ret_code != CR_GENID_SUCCESS ) { SetErrorInfo( __FUNCTION__, __LINE__ ); @@ -258,7 +260,7 @@ int hsm_initialize( void ) // load ecdsa prod keypair ret_code = hsm_ecdsa_load_keypair( hsmEcdsaPrivkeyidentProd, &hsmEcdsaPrivkeyidProd, - *(NFKM_KeyIdent*)NULL, &hsmEcdsaPubkeyidProd ); + hsmEcdsaPubkeyidentProd, &hsmEcdsaPubkeyidProd ); if ( ret_code != CR_GENID_SUCCESS ) { SetErrorInfo( __FUNCTION__, __LINE__ ); @@ -284,9 +286,6 @@ int hsm_finalize( void ) // void NFastApp_Finish( hsmHandle, NULL ); - printf( "final, hsm alloc counter : %d\n", my_hsm_get_alloc_counter() ); - printf( "final, hsmbn alloc counter : %d\n", my_bignum_get_alloc_counter() ); - return ret_code; } // hsm_finalize @@ -888,7 +887,7 @@ int hsm_ecdsa_sign( unsigned char *sign_buf, unsigned char *data_buf, unsigned c // verify -#if 0 +#if 1 struct NFast_Bignum *rBn, *sBn; my_bignumCopy( &rBn, reply.reply.sign.sig.data.ecdsa.r, hsmHandle ); my_bignumCopy( &sBn, reply.reply.sign.sig.data.ecdsa.s, hsmHandle );