From 0affc653595ae636b4ffc19a3f5be0b21f7afb99 Mon Sep 17 00:00:00 2001
From: kubodera_yuichi <kubodera_yuichi@ff987cc8-cf2f-4642-8568-d52cce064691>
Date: Tue, 19 Jan 2010 12:45:53 +0000
Subject: [PATCH] =?UTF-8?q?ECDSA-SHA256=E3=81=AEOpenSSL=E7=BD=B2=E5=90=8D?=
 =?UTF-8?q?=E6=A4=9C=E8=A8=BC=E3=81=AB=E6=88=90=E5=8A=9F(crypto/ecdsa/ecs?=
 =?UTF-8?q?=5Fossl.c=20=E3=81=AE=E6=94=B9=E5=A4=89=E3=81=8C=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81)?=
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@184 ff987cc8-cf2f-4642-8568-d52cce064691
---
 trunk/cr_device_cert.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/trunk/cr_device_cert.c b/trunk/cr_device_cert.c
index de4c59f..3c1e4ba 100644
--- a/trunk/cr_device_cert.c
+++ b/trunk/cr_device_cert.c
@@ -389,26 +389,17 @@ int GenerateCTRDeviceCert( EC_KEY *pECkey, u32 device_id, u8 bonding_option, u8
 		memcpy( &signBuf[0x24], &deviceCert.eccSignature[30], 0x1E );	
 		DEBUG_PRINT_ARRAY( (char*)"sign(HSM)", (const char *)signBuf, signLen );
 
-#ifdef ECDSA_SHA256
-		// TODO : ECDSA-SHA256 での検証を通す
-#if 0
 		// 署名ベリファイ
-		ret_code = ECDSA_verify( 0, verifyHash, 30, signBuf, signLen, NCT2 );
+#ifdef ECDSA_SHA256
+		ret_code = ECDSA_verify( 0, sha256Buf, 32, signBuf, signLen, NCT2 );
+#else	// !ECDSA_SHA256
+		ret_code = ECDSA_verify( 0, sha1Buf, 20, signBuf, signLen, NCT2 );
+#endif	// ECDSA_SHA256
 		if( ret_code != 1) {
 			ret_code = CR_GENID_ERROR_ECDSA_VERIFY;
 			SetErrorInfo( __FUNCTION__, __LINE__ );
 			goto end;
 		}
-#endif
-#else	// !ECDSA_SHA256
-		// 署名ベリファイ
-		ret_code = ECDSA_verify( 0, sha1Buf, 20, signBuf, signLen, NCT2 );
-	    if( ret_code != 1) {
-			ret_code = CR_GENID_ERROR_ECDSA_VERIFY;
-			SetErrorInfo( __FUNCTION__, __LINE__ );
-			goto end;
-		}
-#endif	// ECDSA_SHA256
 	}
 
 	ret_code = CR_GENID_SUCCESS;