Skip to content

Commit

Permalink
Merge pull request #8134 from dgarske/ge448
Browse files Browse the repository at this point in the history 
Fix GE448 conversion warning
  • Loading branch information
@douzzer
douzzer authored Nov 1, 2024
2 parents 24003b2 + 6e3f83d commit 6b78726
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
38 changes: 19 additions & 19 deletions wolfcrypt/src/ge_448.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5453,56 +5453,56 @@ void sc448_reduce(byte* b)
b[ 0] = (byte)(d[0 ] >> 0);
b[ 1] = (byte)(d[0 ] >> 8);
b[ 2] = (byte)(d[0 ] >> 16);
b[ 3] = (byte)(d[0 ] >> 24) + ((d[1 ] >> 0) << 4);
b[ 3] = (byte)(d[0 ] >> 24) + (byte)((d[1 ] >> 0) << 4);
b[ 4] = (byte)(d[1 ] >> 4);
b[ 5] = (byte)(d[1 ] >> 12);
b[ 6] = (byte)(d[1 ] >> 20);
b[ 7] = (byte)(d[2 ] >> 0);
b[ 8] = (byte)(d[2 ] >> 8);
b[ 9] = (byte)(d[2 ] >> 16);
b[10] = (byte)(d[2 ] >> 24) + ((d[3 ] >> 0) << 4);
b[10] = (byte)(d[2 ] >> 24) + (byte)((d[3 ] >> 0) << 4);
b[11] = (byte)(d[3 ] >> 4);
b[12] = (byte)(d[3 ] >> 12);
b[13] = (byte)(d[3 ] >> 20);
b[14] = (byte)(d[4 ] >> 0);
b[15] = (byte)(d[4 ] >> 8);
b[16] = (byte)(d[4 ] >> 16);
b[17] = (byte)(d[4 ] >> 24) + ((d[5 ] >> 0) << 4);
b[17] = (byte)(d[4 ] >> 24) + (byte)((d[5 ] >> 0) << 4);
b[18] = (byte)(d[5 ] >> 4);
b[19] = (byte)(d[5 ] >> 12);
b[20] = (byte)(d[5 ] >> 20);
b[21] = (byte)(d[6 ] >> 0);
b[22] = (byte)(d[6 ] >> 8);
b[23] = (byte)(d[6 ] >> 16);
b[24] = (byte)(d[6 ] >> 24) + ((d[7 ] >> 0) << 4);
b[24] = (byte)(d[6 ] >> 24) + (byte)((d[7 ] >> 0) << 4);
b[25] = (byte)(d[7 ] >> 4);
b[26] = (byte)(d[7 ] >> 12);
b[27] = (byte)(d[7 ] >> 20);
b[28] = (byte)(d[8 ] >> 0);
b[29] = (byte)(d[8 ] >> 8);
b[30] = (byte)(d[8 ] >> 16);
b[31] = (byte)(d[8 ] >> 24) + ((d[9 ] >> 0) << 4);
b[31] = (byte)(d[8 ] >> 24) + (byte)((d[9 ] >> 0) << 4);
b[32] = (byte)(d[9 ] >> 4);
b[33] = (byte)(d[9 ] >> 12);
b[34] = (byte)(d[9 ] >> 20);
b[35] = (byte)(d[10] >> 0);
b[36] = (byte)(d[10] >> 8);
b[37] = (byte)(d[10] >> 16);
b[38] = (byte)(d[10] >> 24) + ((d[11] >> 0) << 4);
b[38] = (byte)(d[10] >> 24) + (byte)((d[11] >> 0) << 4);
b[39] = (byte)(d[11] >> 4);
b[40] = (byte)(d[11] >> 12);
b[41] = (byte)(d[11] >> 20);
b[42] = (byte)(d[12] >> 0);
b[43] = (byte)(d[12] >> 8);
b[44] = (byte)(d[12] >> 16);
b[45] = (byte)(d[12] >> 24) + ((d[13] >> 0) << 4);
b[45] = (byte)(d[12] >> 24) + (byte)((d[13] >> 0) << 4);
b[46] = (byte)(d[13] >> 4);
b[47] = (byte)(d[13] >> 12);
b[48] = (byte)(d[13] >> 20);
b[49] = (byte)(d[14] >> 0);
b[50] = (byte)(d[14] >> 8);
b[51] = (byte)(d[14] >> 16);
b[52] = (byte)(d[14] >> 24) + ((d[15] >> 0) << 4);
b[52] = (byte)(d[14] >> 24) + (byte)((d[15] >> 0) << 4);
b[53] = (byte)(d[15] >> 4);
b[54] = (byte)(d[15] >> 12);
b[55] = (byte)(d[15] >> 20);
Expand Down Expand Up @@ -6206,56 +6206,56 @@ void sc448_muladd(byte* r, const byte* a, const byte* b, const byte* d)
r[ 0] = (byte)(rd[0 ] >> 0);
r[ 1] = (byte)(rd[0 ] >> 8);
r[ 2] = (byte)(rd[0 ] >> 16);
r[ 3] = (byte)(rd[0 ] >> 24) + ((rd[1 ] >> 0) << 4);
r[ 3] = (byte)(rd[0 ] >> 24) + (byte)((rd[1 ] >> 0) << 4);
r[ 4] = (byte)(rd[1 ] >> 4);
r[ 5] = (byte)(rd[1 ] >> 12);
r[ 6] = (byte)(rd[1 ] >> 20);
r[ 7] = (byte)(rd[2 ] >> 0);
r[ 8] = (byte)(rd[2 ] >> 8);
r[ 9] = (byte)(rd[2 ] >> 16);
r[10] = (byte)(rd[2 ] >> 24) + ((rd[3 ] >> 0) << 4);
r[10] = (byte)(rd[2 ] >> 24) + (byte)((rd[3 ] >> 0) << 4);
r[11] = (byte)(rd[3 ] >> 4);
r[12] = (byte)(rd[3 ] >> 12);
r[13] = (byte)(rd[3 ] >> 20);
r[14] = (byte)(rd[4 ] >> 0);
r[15] = (byte)(rd[4 ] >> 8);
r[16] = (byte)(rd[4 ] >> 16);
r[17] = (byte)(rd[4 ] >> 24) + ((rd[5 ] >> 0) << 4);
r[17] = (byte)(rd[4 ] >> 24) + (byte)((rd[5 ] >> 0) << 4);
r[18] = (byte)(rd[5 ] >> 4);
r[19] = (byte)(rd[5 ] >> 12);
r[20] = (byte)(rd[5 ] >> 20);
r[21] = (byte)(rd[6 ] >> 0);
r[22] = (byte)(rd[6 ] >> 8);
r[23] = (byte)(rd[6 ] >> 16);
r[24] = (byte)(rd[6 ] >> 24) + ((rd[7 ] >> 0) << 4);
r[24] = (byte)(rd[6 ] >> 24) + (byte)((rd[7 ] >> 0) << 4);
r[25] = (byte)(rd[7 ] >> 4);
r[26] = (byte)(rd[7 ] >> 12);
r[27] = (byte)(rd[7 ] >> 20);
r[28] = (byte)(rd[8 ] >> 0);
r[29] = (byte)(rd[8 ] >> 8);
r[30] = (byte)(rd[8 ] >> 16);
r[31] = (byte)(rd[8 ] >> 24) + ((rd[9 ] >> 0) << 4);
r[31] = (byte)(rd[8 ] >> 24) + (byte)((rd[9 ] >> 0) << 4);
r[32] = (byte)(rd[9 ] >> 4);
r[33] = (byte)(rd[9 ] >> 12);
r[34] = (byte)(rd[9 ] >> 20);
r[35] = (byte)(rd[10] >> 0);
r[36] = (byte)(rd[10] >> 8);
r[37] = (byte)(rd[10] >> 16);
r[38] = (byte)(rd[10] >> 24) + ((rd[11] >> 0) << 4);
r[38] = (byte)(rd[10] >> 24) + (byte)((rd[11] >> 0) << 4);
r[39] = (byte)(rd[11] >> 4);
r[40] = (byte)(rd[11] >> 12);
r[41] = (byte)(rd[11] >> 20);
r[42] = (byte)(rd[12] >> 0);
r[43] = (byte)(rd[12] >> 8);
r[44] = (byte)(rd[12] >> 16);
r[45] = (byte)(rd[12] >> 24) + ((rd[13] >> 0) << 4);
r[45] = (byte)(rd[12] >> 24) + (byte)((rd[13] >> 0) << 4);
r[46] = (byte)(rd[13] >> 4);
r[47] = (byte)(rd[13] >> 12);
r[48] = (byte)(rd[13] >> 20);
r[49] = (byte)(rd[14] >> 0);
r[50] = (byte)(rd[14] >> 8);
r[51] = (byte)(rd[14] >> 16);
r[52] = (byte)(rd[14] >> 24) + ((rd[15] >> 0) << 4);
r[52] = (byte)(rd[14] >> 24) + (byte)((rd[15] >> 0) << 4);
r[53] = (byte)(rd[15] >> 4);
r[54] = (byte)(rd[15] >> 12);
r[55] = (byte)(rd[15] >> 20);
Expand Down Expand Up @@ -10602,7 +10602,7 @@ int ge448_scalarmult_base(ge448_p2* r, const byte* a)
e[112] = carry;
/* each e[i] is between -8 and 8 */

/* Odd indeces first - sum based on even index so multiply by 16 */
/* Odd indices first - sum based on even index so multiply by 16 */
ge448_select(t, 0, e[1]);
fe448_copy(r->X, t->x);
fe448_copy(r->Y, t->y);
Expand All @@ -10617,7 +10617,7 @@ int ge448_scalarmult_base(ge448_p2* r, const byte* a)
ge448_dbl(r, r);
ge448_dbl(r, r);

/* Add even indeces */
/* Add even indices */
for (i = 0; i <= 112; i += 2) {
ge448_select(t, i / 2, e[i]);
ge448_madd(r, r, t);
Expand All @@ -10633,7 +10633,7 @@ int ge448_scalarmult_base(ge448_p2* r, const byte* a)

/* Create to a sliding window for the scalar multiplicaton.
*
* r [in] Array of indeces.
* r [in] Array of indices.
* a [in] Scalar to break up.
*/
static void slide(sword8 *r, const byte *a)
Expand Down
18 changes: 9 additions & 9 deletions wolfcrypt/src/sp_arm32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78329,7 +78329,7 @@ static void sp_256_div2_mod_8(sp_digit* r_p, const sp_digit* a_p, const sp_digit
}

#if defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
static const unsigned char L_sp_256_num_bits_8_table[] = {
static const byte L_sp_256_num_bits_8_table[] = {
0x00, 0x01, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03,
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
Expand Down Expand Up @@ -78367,8 +78367,8 @@ static const unsigned char L_sp_256_num_bits_8_table[] = {
static int sp_256_num_bits_8(const sp_digit* a_p)
{
register const sp_digit* a asm ("r0") = (const sp_digit*)a_p;
register unsigned char* L_sp_256_num_bits_8_table_c asm ("r1") =
(unsigned char*)&L_sp_256_num_bits_8_table;
register byte* L_sp_256_num_bits_8_table_c asm ("r1") =
(byte*)&L_sp_256_num_bits_8_table;

__asm__ __volatile__ (
"mov lr, %[L_sp_256_num_bits_8_table]\n\t"
Expand Down Expand Up @@ -96088,7 +96088,7 @@ static void sp_384_div2_mod_12(sp_digit* r_p, const sp_digit* a_p, const sp_digi
}

#if defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
static const unsigned char L_sp_384_num_bits_12_table[] = {
static const byte L_sp_384_num_bits_12_table[] = {
0x00, 0x01, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03,
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
Expand Down Expand Up @@ -96126,8 +96126,8 @@ static const unsigned char L_sp_384_num_bits_12_table[] = {
static int sp_384_num_bits_12(const sp_digit* a_p)
{
register const sp_digit* a asm ("r0") = (const sp_digit*)a_p;
register unsigned char* L_sp_384_num_bits_12_table_c asm ("r1") =
(unsigned char*)&L_sp_384_num_bits_12_table;
register byte* L_sp_384_num_bits_12_table_c asm ("r1") =
(byte*)&L_sp_384_num_bits_12_table;

__asm__ __volatile__ (
"mov lr, %[L_sp_384_num_bits_12_table]\n\t"
Expand Down Expand Up @@ -124642,7 +124642,7 @@ static void sp_521_div2_mod_17(sp_digit* r_p, const sp_digit* a_p, const sp_digi
}

#if defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
static const unsigned char L_sp_521_num_bits_17_table[] = {
static const byte L_sp_521_num_bits_17_table[] = {
0x00, 0x01, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03,
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
Expand Down Expand Up @@ -124680,8 +124680,8 @@ static const unsigned char L_sp_521_num_bits_17_table[] = {
static int sp_521_num_bits_17(const sp_digit* a_p)
{
register const sp_digit* a asm ("r0") = (const sp_digit*)a_p;
register unsigned char* L_sp_521_num_bits_17_table_c asm ("r1") =
(unsigned char*)&L_sp_521_num_bits_17_table;
register byte* L_sp_521_num_bits_17_table_c asm ("r1") =
(byte*)&L_sp_521_num_bits_17_table;

__asm__ __volatile__ (
"mov lr, %[L_sp_521_num_bits_17_table]\n\t"
Expand Down

0 comments on commit 6b78726

Please sign in to comment.