diff --git a/cr_generate_id.c b/cr_generate_id.c
index cfb2fea..4a070be 100644
--- a/cr_generate_id.c
+++ b/cr_generate_id.c
@@ -210,21 +210,21 @@ int cr_generate_id( u32 device_id[CR_NUM_OF_DEVICEID], u8 id_buf[CR_ID_BUF_SIZE]
     }
 #endif
 
-	// ダイジェストアルゴリズムを追加する
-	OpenSSL_add_all_digests();
-
     //--------------------------------------------------------------
     // 暗号処理初期化
     //--------------------------------------------------------------
 
     // メモリリーク防止のため、オリジナルのアロケータを使用。
-    CRYPTO_set_mem_functions(cr_mem_malloc, cr_mem_realloc, cr_mem_free);
+    CRYPTO_set_mem_functions(cr_mem_malloc, cr_mem_realloc, cr_mem_free); 
     cr_mem_bufmgr_initialize();
 
 #ifdef MY_CRYPTO_DEBUG
     ERR_load_crypto_strings(); 
 #endif /* MY_CRYPTO_DEBUG */
 
+	// ダイジェストアルゴリズムを追加する
+	OpenSSL_add_all_digests();
+
     //--------------------------------------------------------------
     // FuseIDバッファに固定データセット
     //--------------------------------------------------------------
diff --git a/cr_hsm_code.c b/cr_hsm_code.c
index d034d02..867edb3 100644
--- a/cr_hsm_code.c
+++ b/cr_hsm_code.c
@@ -944,7 +944,7 @@ int hsm_ecdsa_sign( unsigned char *sign_buf, unsigned char *data_buf, unsigned c
 	my_bignumCopy( &rBn, reply.reply.sign.sig.data.ecdsa.r, hsmHandle );
 	my_bignumCopy( &sBn, reply.reply.sign.sig.data.ecdsa.s, hsmHandle );
 
-	//NFastApp_Free_Command( handle, NULL, NULL, &cmd );
+	NFastApp_Free_Command( hsmHandle, NULL, NULL, &cmd );
 	NFastApp_Free_Reply( hsmHandle, NULL, NULL, &reply );
 	memset( &cmd, 0, sizeof( cmd ) );
 	memset( &reply, 0, sizeof( reply ) );
@@ -979,7 +979,10 @@ int hsm_ecdsa_sign( unsigned char *sign_buf, unsigned char *data_buf, unsigned c
 	
 	NFastApp_Free( hsmHandle, rBn, NULL, NULL );
 	NFastApp_Free( hsmHandle, sBn, NULL, NULL );
+#else	// !verify
+	NFastApp_Free_Command( hsmHandle, NULL, NULL, &cmd );
 #endif	// verify
+	NFastApp_Free_Reply( hsmHandle, NULL, NULL, &reply );	
 		
 	// copy sign
 	int i;
@@ -1000,8 +1003,6 @@ int hsm_ecdsa_sign( unsigned char *sign_buf, unsigned char *data_buf, unsigned c
 			sign_buf[ 60 - i - 1 ] = sPtr[ sLen - i - 1 ];
 	}
 
-	//NFastApp_Free_Command( hsmHandle, NULL, NULL, &cmd );	// ���̂��A�{�[�g����
-	NFastApp_Free_Reply( hsmHandle, NULL, NULL, &reply );	
 	cr_mem_free( rPtr );
 	cr_mem_free( sPtr );