kmackay/micro-ecc
1
0
Fork 0
mirror of https://github.com/kmackay/micro-ecc.git synced 2026-09-15 21:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #168

Browse Source
This commit is contained in:
Ken MacKay
2020-10-07 10:47:40 -07:00
parent 622a7f82ac
commit 1b5f5cea51
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uECC.c
+13 -4
View File
@@ -1210,7 +1210,7 @@ static void bits2int(uECC_word_t *native,
bcopy((uint8_t *) native, bits, bits_size); bcopy((uint8_t *) native, bits, bits_size);
#else #else
uECC_vli_bytesToNative(native, bits, bits_size); uECC_vli_bytesToNative(native, bits, bits_size);
#endif #endif
if (bits_size * 8 <= (unsigned)curve->num_n_bits) { if (bits_size * 8 <= (unsigned)curve->num_n_bits) {
return; return;
} }
@@ -1239,6 +1239,7 @@ static int uECC_sign_with_k(const uint8_t *private_key,
uECC_word_t tmp[uECC_MAX_WORDS]; uECC_word_t tmp[uECC_MAX_WORDS];
uECC_word_t s[uECC_MAX_WORDS]; uECC_word_t s[uECC_MAX_WORDS];
uECC_word_t *k2[2] = {tmp, s}; uECC_word_t *k2[2] = {tmp, s};
uECC_word_t *initial_Z = 0;
#if uECC_VLI_NATIVE_LITTLE_ENDIAN #if uECC_VLI_NATIVE_LITTLE_ENDIAN
uECC_word_t *p = (uECC_word_t *)signature; uECC_word_t *p = (uECC_word_t *)signature;
#else #else
@@ -1255,7 +1256,15 @@ static int uECC_sign_with_k(const uint8_t *private_key,
} }
carry = regularize_k(k, tmp, s, curve); carry = regularize_k(k, tmp, s, curve);
EccPoint_mult(p, curve->G, k2[!carry], 0, num_n_bits + 1, curve); /* If an RNG function was specified, try to get a random initial Z value to improve
protection against side-channel attacks. */
if (g_rng_function) {
if (!uECC_generate_random_int(k2[carry], curve->p, num_words)) {
return 0;
}
initial_Z = k2[carry];
}
EccPoint_mult(p, curve->G, k2[!carry], initial_Z, num_n_bits + 1, curve);
if (uECC_vli_isZero(p, num_words)) { if (uECC_vli_isZero(p, num_words)) {
return 0; return 0;
} }
@@ -1299,7 +1308,7 @@ static int uECC_sign_with_k(const uint8_t *private_key,
bcopy((uint8_t *) signature + curve->num_bytes, (uint8_t *) s, curve->num_bytes); bcopy((uint8_t *) signature + curve->num_bytes, (uint8_t *) s, curve->num_bytes);
#else #else
uECC_vli_nativeToBytes(signature + curve->num_bytes, curve->num_bytes, s); uECC_vli_nativeToBytes(signature + curve->num_bytes, curve->num_bytes, s);
#endif #endif
return 1; return 1;
} }
@@ -1472,7 +1481,7 @@ int uECC_verify(const uint8_t *public_key,
uECC_word_t *_public = (uECC_word_t *)public_key; uECC_word_t *_public = (uECC_word_t *)public_key;
#else #else
uECC_word_t _public[uECC_MAX_WORDS * 2]; uECC_word_t _public[uECC_MAX_WORDS * 2];
#endif #endif
uECC_word_t r[uECC_MAX_WORDS], s[uECC_MAX_WORDS]; uECC_word_t r[uECC_MAX_WORDS], s[uECC_MAX_WORDS];
wordcount_t num_words = curve->num_words; wordcount_t num_words = curve->num_words;
wordcount_t num_n_words = BITS_TO_WORDS(curve->num_n_bits); wordcount_t num_n_words = BITS_TO_WORDS(curve->num_n_bits);