AuroraMiddleware/libtomcrypt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make LTC_ECCSIG_RFC7518 strict (again)

Browse Source
This commit is contained in:
Karel Miko 2018-10-07 22:11:46 +02:00
parent dec99ed99c
commit c2cdaaab4d
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pk/ecc/ecc_verify_hash.c
View File

@ -76,11 +76,11 @@ int ecc_verify_hash_ex(const unsigned char *sig, unsigned long siglen,
}
else if (sigformat == LTC_ECCSIG_RFC7518) {
/* RFC7518 format - raw (r,s) */
if ((siglen % 2) == 1) {
i = mp_unsigned_bin_size(key->dp.order);
if (siglen != (2 * i)) {
err = CRYPT_INVALID_PACKET;
goto error;
}
i = siglen / 2;
if ((err = mp_read_unsigned_bin(r, (unsigned char *)sig, i)) != CRYPT_OK) { goto error; }
if ((err = mp_read_unsigned_bin(s, (unsigned char *)sig+i, i)) != CRYPT_OK) { goto error; }
}

15
tests/ecc_test.c
View File

@ -240,11 +240,12 @@ done:
}
/* https://github.com/libtom/libtomcrypt/issues/443 */
static int _ecc_issue443(void)
/* https://github.com/libtom/libtomcrypt/issues/447 */
static int _ecc_issue443_447(void)
{
const ltc_ecc_curve* cu;
ecc_key key;
int stat = 0;
int err, stat = 0;
unsigned char hash[64];
unsigned long hashlen;
const unsigned char msg[] = { 0x54,0x65,0x73,0x74 };
@ -274,18 +275,18 @@ static int _ecc_issue443(void)
DO(ecc_find_curve("secp256r1", &cu));
DO(ecc_set_curve(cu, &key));
DO(ecc_set_key(pub1, sizeof(pub1), PK_PUBLIC, &key));
DO(ecc_verify_hash_rfc7518(sig1, sizeof(sig1), hash, hashlen, &stat, &key));
err = ecc_verify_hash_rfc7518(sig1, sizeof(sig1), hash, hashlen, &stat, &key); /* should fail */
ecc_free(&key);
if (stat != 1) return CRYPT_FAIL_TESTVECTOR;
if (err != CRYPT_INVALID_PACKET) return CRYPT_FAIL_TESTVECTOR;
hashlen = sizeof(hash);
DO(hash_memory(find_hash("sha512"), msg, sizeof(msg), hash, &hashlen));
DO(ecc_find_curve("secp521r1", &cu));
DO(ecc_set_curve(cu, &key));
DO(ecc_set_key(pub2, sizeof(pub2), PK_PUBLIC, &key));
DO(ecc_verify_hash_rfc7518(sig2, sizeof(sig2), hash, hashlen, &stat, &key));
err = ecc_verify_hash_rfc7518(sig2, sizeof(sig2), hash, hashlen, &stat, &key); /* should fail */
ecc_free(&key);
if (stat != 1) return CRYPT_FAIL_TESTVECTOR;
if (err != CRYPT_INVALID_PACKET) return CRYPT_FAIL_TESTVECTOR;
return CRYPT_OK;
}
@ -1598,7 +1599,7 @@ int ecc_tests(void)
DO(_ecc_import_export());
DO(_ecc_test_mp());
DO(_ecc_issue108());
DO(_ecc_issue443());
DO(_ecc_issue443_447());
#ifdef LTC_ECC_SHAMIR
DO(_ecc_test_shamir());
DO(_ecc_test_recovery());