From 4c033494c219325fca55d3096b9c1206920081b6 Mon Sep 17 00:00:00 2001
From: kubodera_yuichi <kubodera_yuichi@ff987cc8-cf2f-4642-8568-d52cce064691>
Date: Fri, 8 Jan 2010 14:43:54 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=83=AD=E3=82=B1=E3=83=BC=E3=82=BF?=
 =?UTF-8?q?=E3=81=AE=E8=A8=AD=E5=AE=9A=E5=89=8D=E3=81=ABOPENSSL=5Fmalloc?=
 =?UTF-8?q?=E3=81=8C=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=95=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E3=81=A8=E4=BB=A5=E5=BE=8C=E3=80=81=E8=A8=AD=E5=AE=9A=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E3=81=AB=E3=81=AA=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_eFuse@167 ff987cc8-cf2f-4642-8568-d52cce064691
---
 cr_generate_id.c | 8 ++++----
 cr_hsm_code.c    | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

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 );