@@ -203,6 +203,53 @@ static int _ecc_issue443(void)
203203 return CRYPT_OK ;
204204}
205205
206+ /* https://github.com/libtom/libtomcrypt/issues/446 */
207+ static int _ecc_issue446 (void )
208+ {
209+ const ltc_ecc_curve * cu ;
210+ ecc_key key ;
211+ int err , stat = 0 ;
212+ unsigned char hash [64 ];
213+ unsigned long hashlen ;
214+ const unsigned char msg [] = { 0x31 ,0x32 ,0x33 ,0x34 ,0x30 ,0x30 };
215+ const unsigned char pub [] = {
216+ 0x04 ,
217+ 0x29 ,0x27 ,0xb1 ,0x05 ,0x12 ,0xba ,0xe3 ,0xed ,0xdc ,0xfe ,0x46 ,0x78 ,0x28 ,0x12 ,0x8b ,0xad ,
218+ 0x29 ,0x03 ,0x26 ,0x99 ,0x19 ,0xf7 ,0x08 ,0x60 ,0x69 ,0xc8 ,0xc4 ,0xdf ,0x6c ,0x73 ,0x28 ,0x38 ,
219+ 0xc7 ,0x78 ,0x79 ,0x64 ,0xea ,0xac ,0x00 ,0xe5 ,0x92 ,0x1f ,0xb1 ,0x49 ,0x8a ,0x60 ,0xf4 ,0x60 ,
220+ 0x67 ,0x66 ,0xb3 ,0xd9 ,0x68 ,0x50 ,0x01 ,0x55 ,0x8d ,0x1a ,0x97 ,0x4e ,0x73 ,0x41 ,0x51 ,0x3e
221+ };
222+ /* msg+pub+sig1 test vector is from wycheproof/ecdsa_test VALID */
223+ const unsigned char sig1 [] = {
224+ 0x30 ,0x45 ,0x02 ,0x20 ,0x2b ,0xa3 ,0xa8 ,0xbe ,0x6b ,0x94 ,0xd5 ,0xec ,0x80 ,0xa6 ,0xd9 ,0xd1 ,0x19 ,0x0a ,
225+ 0x43 ,0x6e ,0xff ,0xe5 ,0x0d ,0x85 ,0xa1 ,0xee ,0xe8 ,0x59 ,0xb8 ,0xcc ,0x6a ,0xf9 ,0xbd ,0x5c ,0x2e ,0x18 ,
226+ 0x02 ,0x21 ,0x00 ,0xb3 ,0x29 ,0xf4 ,0x79 ,0xa2 ,0xbb ,0xd0 ,0xa5 ,0xc3 ,0x84 ,0xee ,0x14 ,0x93 ,0xb1 ,0xf5 ,
227+ 0x18 ,0x6a ,0x87 ,0x13 ,0x9c ,0xac ,0x5d ,0xf4 ,0x08 ,0x7c ,0x13 ,0x4b ,0x49 ,0x15 ,0x68 ,0x47 ,0xdb ,
228+ };
229+ /* msg+pub+sig2 test vector is from wycheproof/ecdsa_test INVALID (changing tag value of sequence) */
230+ const unsigned char sig2 [] = {
231+ 0x31 ,0x45 ,0x02 ,0x20 ,0x2b ,0xa3 ,0xa8 ,0xbe ,0x6b ,0x94 ,0xd5 ,0xec ,0x80 ,0xa6 ,0xd9 ,0xd1 ,0x19 ,0x0a ,
232+ 0x43 ,0x6e ,0xff ,0xe5 ,0x0d ,0x85 ,0xa1 ,0xee ,0xe8 ,0x59 ,0xb8 ,0xcc ,0x6a ,0xf9 ,0xbd ,0x5c ,0x2e ,0x18 ,
233+ 0x02 ,0x21 ,0x00 ,0xb3 ,0x29 ,0xf4 ,0x79 ,0xa2 ,0xbb ,0xd0 ,0xa5 ,0xc3 ,0x84 ,0xee ,0x14 ,0x93 ,0xb1 ,0xf5 ,
234+ 0x18 ,0x6a ,0x87 ,0x13 ,0x9c ,0xac ,0x5d ,0xf4 ,0x08 ,0x7c ,0x13 ,0x4b ,0x49 ,0x15 ,0x68 ,0x47 ,0xdb ,
235+ };
236+
237+ hashlen = sizeof (hash );
238+ DO (hash_memory (find_hash ("sha256" ), msg , sizeof (msg ), hash , & hashlen ));
239+ DO (ecc_find_curve ("secp256r1" , & cu ));
240+ DO (ecc_set_curve (cu , & key ));
241+ DO (ecc_set_key (pub , sizeof (pub ), PK_PUBLIC , & key ));
242+
243+ DO (ecc_verify_hash (sig1 , sizeof (sig1 ), hash , hashlen , & stat , & key ));
244+ if (stat != 1 ) return CRYPT_FAIL_TESTVECTOR ; /* expected result: VALID */
245+
246+ err = ecc_verify_hash (sig2 , sizeof (sig2 ), hash , hashlen , & stat , & key );
247+ if (err == CRYPT_OK && stat == 1 ) return CRYPT_FAIL_TESTVECTOR ; /* expected result: INVALID */
248+
249+ ecc_free (& key );
250+ return CRYPT_OK ;
251+ }
252+
206253static int _ecc_test_mp (void )
207254{
208255 void * a , * modulus , * order ;
@@ -1672,6 +1719,7 @@ int ecc_tests(void)
16721719 DO (_ecc_test_mp ());
16731720 DO (_ecc_issue108 ());
16741721 DO (_ecc_issue443 ());
1722+ DO (_ecc_issue446 ());
16751723#ifdef LTC_ECC_SHAMIR
16761724 DO (_ecc_test_shamir ());
16771725 DO (_ecc_test_recovery ());
0 commit comments