wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

SP: WOLFSSL_SP_ARM_ARCH to WOLFSSL_ARM_ARCH and fix SAKKE on Thumb2/ARM32

Browse Source 
WOLFSSL_SP_ARM_ARCH no longer used.
Using WOLFSSL_ARM_ARCH instead.
Change umaal check to only available with WOLFSSL_ARM_ARCH > 6.
SAKKE mont_reduce with umaal not using correct registers at end.
This commit is contained in:
Sean Parkinson
2023-09-14 10:26:26 +10:00
parent 3ae23ec926
commit 6a25cdeb28
4 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
wolfcrypt/src/sp_arm32.c
View File

@ -2234,7 +2234,7 @@ static void sp_2048_mul_8(sp_digit* r_p, const sp_digit* a_p, const sp_digit* b_
); );
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Multiply a and b into r. (r = a * b) /* Multiply a and b into r. (r = a * b)
* *
* r A single precision integer. * r A single precision integer.
@ -4683,7 +4683,7 @@ static void sp_2048_sqr_8(sp_digit* r_p, const sp_digit* a_p)
); );
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Square a and put result in r. (r = a * a) /* Square a and put result in r. (r = a * a)
* *
* r A single precision integer. * r A single precision integer.
@ -9305,7 +9305,7 @@ static SP_NOINLINE void sp_2048_mont_reduce_32(sp_digit* a_p, const sp_digit* m_
sp_2048_cond_sub_32(a - 32, a, m, (sp_digit)0 - mp); sp_2048_cond_sub_32(a - 32, a, m, (sp_digit)0 - mp);
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Reduce the number back to 2048 bits using Montgomery reduction. /* Reduce the number back to 2048 bits using Montgomery reduction.
* *
* a A single precision number to reduce in place. * a A single precision number to reduce in place.
@ -14167,7 +14167,7 @@ static SP_NOINLINE void sp_2048_mont_reduce_64(sp_digit* a_p, const sp_digit* m_
sp_2048_cond_sub_64(a - 64, a, m, (sp_digit)0 - mp); sp_2048_cond_sub_64(a - 64, a, m, (sp_digit)0 - mp);
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Reduce the number back to 2048 bits using Montgomery reduction. /* Reduce the number back to 2048 bits using Montgomery reduction.
* *
* a A single precision number to reduce in place. * a A single precision number to reduce in place.
@ -33531,7 +33531,7 @@ static SP_NOINLINE void sp_3072_mont_reduce_48(sp_digit* a_p, const sp_digit* m_
sp_3072_cond_sub_48(a - 48, a, m, (sp_digit)0 - mp); sp_3072_cond_sub_48(a - 48, a, m, (sp_digit)0 - mp);
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Reduce the number back to 3072 bits using Montgomery reduction. /* Reduce the number back to 3072 bits using Montgomery reduction.
* *
* a A single precision number to reduce in place. * a A single precision number to reduce in place.
@ -40329,7 +40329,7 @@ static SP_NOINLINE void sp_3072_mont_reduce_96(sp_digit* a_p, const sp_digit* m_
sp_3072_cond_sub_96(a - 96, a, m, (sp_digit)0 - mp); sp_3072_cond_sub_96(a - 96, a, m, (sp_digit)0 - mp);
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Reduce the number back to 3072 bits using Montgomery reduction. /* Reduce the number back to 3072 bits using Montgomery reduction.
* *
* a A single precision number to reduce in place. * a A single precision number to reduce in place.
@ -54796,7 +54796,7 @@ static SP_NOINLINE void sp_4096_mont_reduce_128(sp_digit* a_p, const sp_digit* m
sp_4096_cond_sub_128(a - 128, a, m, (sp_digit)0 - mp); sp_4096_cond_sub_128(a - 128, a, m, (sp_digit)0 - mp);
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Reduce the number back to 4096 bits using Montgomery reduction. /* Reduce the number back to 4096 bits using Montgomery reduction.
* *
* a A single precision number to reduce in place. * a A single precision number to reduce in place.
@ -62896,7 +62896,7 @@ static void sp_256_mul_8(sp_digit* r_p, const sp_digit* a_p, const sp_digit* b_p
); );
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Multiply a and b into r. (r = a * b) /* Multiply a and b into r. (r = a * b)
* *
* r A single precision integer. * r A single precision integer.
@ -64733,7 +64733,7 @@ static void sp_256_sqr_8(sp_digit* r_p, const sp_digit* a_p)
); );
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Square a and put result in r. (r = a * a) /* Square a and put result in r. (r = a * a)
* *
* r A single precision integer. * r A single precision integer.
@ -67796,7 +67796,7 @@ static SP_NOINLINE void sp_256_mont_mul_8(sp_digit* r_p, const sp_digit* a_p, co
(void)mp_p; (void)mp_p;
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Multiply two Montgomery form numbers mod the modulus (prime). /* Multiply two Montgomery form numbers mod the modulus (prime).
* (r = a * b mod m) * (r = a * b mod m)
* *
@ -69729,7 +69729,7 @@ static SP_NOINLINE void sp_256_mont_sqr_8(sp_digit* r_p, const sp_digit* a_p, co
(void)mp_p; (void)mp_p;
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Square the Montgomery form number mod the modulus (prime). (r = a * a mod m) /* Square the Montgomery form number mod the modulus (prime). (r = a * a mod m)
* *
* r Result of squaring. * r Result of squaring.
@ -70956,7 +70956,7 @@ static SP_NOINLINE void sp_256_mont_reduce_8(sp_digit* a_p, const sp_digit* m_p,
sp_256_cond_sub_8(a - 8, a, m, (sp_digit)0 - mp); sp_256_cond_sub_8(a - 8, a, m, (sp_digit)0 - mp);
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Reduce the number back to 256 bits using Montgomery reduction. /* Reduce the number back to 256 bits using Montgomery reduction.
* *
* a A single precision number to reduce in place. * a A single precision number to reduce in place.
@ -71535,7 +71535,7 @@ static SP_NOINLINE void sp_256_mont_reduce_order_8(sp_digit* a_p, const sp_digit
sp_256_cond_sub_8(a - 8, a, m, (sp_digit)0 - mp); sp_256_cond_sub_8(a - 8, a, m, (sp_digit)0 - mp);
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Reduce the number back to 256 bits using Montgomery reduction. /* Reduce the number back to 256 bits using Montgomery reduction.
* *
* a A single precision number to reduce in place. * a A single precision number to reduce in place.
@ -88721,7 +88721,7 @@ static SP_NOINLINE void sp_384_mont_reduce_12(sp_digit* a_p, const sp_digit* m_p
sp_384_cond_sub_12(a - 12, a, m, (sp_digit)0 - mp); sp_384_cond_sub_12(a - 12, a, m, (sp_digit)0 - mp);
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Reduce the number back to 384 bits using Montgomery reduction. /* Reduce the number back to 384 bits using Montgomery reduction.
* *
* a A single precision number to reduce in place. * a A single precision number to reduce in place.
@ -115365,7 +115365,7 @@ static SP_NOINLINE void sp_521_mont_reduce_order_17(sp_digit* a_p, const sp_digi
sp_521_cond_sub_17(a - 17, a, m, (sp_digit)0 - mp); sp_521_cond_sub_17(a - 17, a, m, (sp_digit)0 - mp);
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Reduce the number back to 521 bits using Montgomery reduction. /* Reduce the number back to 521 bits using Montgomery reduction.
* *
* a A single precision number to reduce in place. * a A single precision number to reduce in place.
@ -144632,7 +144632,7 @@ static SP_NOINLINE void sp_1024_mont_reduce_32(sp_digit* a_p, const sp_digit* m_
sp_1024_cond_sub_32(a - 32, a, m, mp); sp_1024_cond_sub_32(a - 32, a, m, mp);
} }
#elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 6) #elif defined(WOLFSSL_ARM_ARCH) && (WOLFSSL_ARM_ARCH < 7)
/* Reduce the number back to 1024 bits using Montgomery reduction. /* Reduce the number back to 1024 bits using Montgomery reduction.
* *
* a A single precision number to reduce in place. * a A single precision number to reduce in place.
@ -145130,10 +145130,10 @@ static SP_NOINLINE void sp_1024_mont_reduce_32(sp_digit* a_p, const sp_digit* m_
"str r7, [%[a], #12]\n\t" "str r7, [%[a], #12]\n\t"
"str r8, [%[a], #16]\n\t" "str r8, [%[a], #16]\n\t"
"ldr r10, [%[m], #124]\n\t" "ldr r10, [%[m], #124]\n\t"
"subs r9, r10, r9\n\t" "subs r3, r10, r3\n\t"
"neg lr, lr\n\t" "neg lr, lr\n\t"
"sbc r9, r9, r9\n\t" "sbc r3, r3, r3\n\t"
"orr lr, lr, r9\n\t" "orr lr, lr, r3\n\t"
"mov %[mp], lr\n\t" "mov %[mp], lr\n\t"
: [a] "+r" (a), [m] "+r" (m), [mp] "+r" (mp) : [a] "+r" (a), [m] "+r" (m), [mp] "+r" (mp)
: :

6
wolfcrypt/src/sp_cortexm.c
View File

@ -67460,10 +67460,10 @@ static void sp_1024_mont_reduce_32(sp_digit* a_p, const sp_digit* m_p, sp_digit
"STR r9, [%[a], #12]\n\t" "STR r9, [%[a], #12]\n\t"
"STR r10, [%[a], #16]\n\t" "STR r10, [%[a], #16]\n\t"
"LDR r12, [%[m], #124]\n\t" "LDR r12, [%[m], #124]\n\t"
"SUBS r11, r12, r11\n\t" "SUBS r3, r12, r3\n\t"
"neg r5, r5\n\t" "neg r5, r5\n\t"
"SBC r11, r11, r11\n\t" "SBC r3, r3, r3\n\t"
"ORR r5, r5, r11\n\t" "ORR r5, r5, r3\n\t"
"MOV %[mp], r5\n\t" "MOV %[mp], r5\n\t"
: [a] "+r" (a), [m] "+r" (m), [mp] "+r" (mp) : [a] "+r" (a), [m] "+r" (m), [mp] "+r" (mp)
: :

1
wolfssl/wolfcrypt/sp.h
View File

@ -24,6 +24,7 @@
#define WOLF_CRYPT_SP_H #define WOLF_CRYPT_SP_H
#include <wolfssl/wolfcrypt/types.h> #include <wolfssl/wolfcrypt/types.h>
#include <wolfssl/wolfcrypt/settings.h>
#if defined(WOLFSSL_HAVE_SP_RSA) || defined(WOLFSSL_HAVE_SP_DH) || \ #if defined(WOLFSSL_HAVE_SP_RSA) || defined(WOLFSSL_HAVE_SP_DH) || \
defined(WOLFSSL_HAVE_SP_ECC) defined(WOLFSSL_HAVE_SP_ECC)

4
wolfssl/wolfcrypt/sp_int.h
View File

@ -37,6 +37,10 @@ This library provides single precision (SP) integer math functions.
extern "C" { extern "C" {
#endif #endif
#if defined(WOLFSSL_SP_ARM_ARCH) && !defined(WOLFSSL_ARM_ARCH)
#define WOLFSSL_ARM_ARCH WOLFSSL_SP_ARM_ARCH
#endif
#if defined(OPENSSL_EXTRA) && !defined(NO_ASN) && \ #if defined(OPENSSL_EXTRA) && !defined(NO_ASN) && \
!defined(WOLFSSL_SP_INT_NEGATIVE) !defined(WOLFSSL_SP_INT_NEGATIVE)
#define WOLFSSL_SP_INT_NEGATIVE #define WOLFSSL_SP_INT_NEGATIVE