wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-01-28 10:52:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes from C++ and address access checking

Browse Source 
Fix access of table for cache resistance.
Don't name variable public or private.
Cast from void*
This commit is contained in:
Sean Parkinson
2020-08-13 15:19:49 +10:00
parent e30341ea83
commit bc74bfebdd
5 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wolfcrypt/src/curve25519.c
View File

@@ -58,19 +58,20 @@ static const unsigned char kCurve25519BasePoint[CURVE25519_KEYSIZE] = {9};
* return value is propagated from curve25519() (0 on success), or ECC_BAD_ARG_E,
* and the byte vectors are little endian.
*/
int wc_curve25519_make_pub(int public_size, byte* public, int private_size, const byte* private) {
int wc_curve25519_make_pub(int public_size, byte* pub, int private_size,
const byte* priv) {
int ret;
if ((public_size != CURVE25519_KEYSIZE) ||
(private_size != CURVE25519_KEYSIZE)) {
return ECC_BAD_ARG_E;
}
if ((public == NULL) || (private == NULL))
if ((pub == NULL) || (priv == NULL))
return ECC_BAD_ARG_E;
/* check clamping */
if ((private[0] & ~248) ||
(private[CURVE25519_KEYSIZE-1] & 128)) {
if ((priv[0] & ~248) ||
(priv[CURVE25519_KEYSIZE-1] & 128)) {
return ECC_BAD_ARG_E;
}
@@ -78,13 +79,13 @@ int wc_curve25519_make_pub(int public_size, byte* public, int private_size, cons
{
const ECPoint* basepoint = nxp_ltc_curve25519_GetBasePoint();
ECPoint wc_pub;
ret = nxp_ltc_curve25519(&wc_pub, private, basepoint, kLTC_Weierstrass); /* input basepoint on Weierstrass curve */
ret = nxp_ltc_curve25519(&wc_pub, priv, basepoint, kLTC_Weierstrass); /* input basepoint on Weierstrass curve */
if (ret == 0)
XMEMCPY(public, wc_pub.point, CURVE25519_KEYSIZE);
XMEMCPY(pub, wc_pub.point, CURVE25519_KEYSIZE);
}
#else
fe_init();
ret = curve25519(public, private, kCurve25519BasePoint);
ret = curve25519(pub, priv, kCurve25519BasePoint);
#endif
return ret;

18
wolfcrypt/src/sp_x86_64_asm.S
View File

@@ -39015,7 +39015,7 @@ _sp_256_get_point_33_4:
movd %edx, %xmm13
addq $200, %rsi
movd %eax, %xmm15
movq $33, %rax
movq $32, %rax
pshufd $0, %xmm15, %xmm15
pshufd $0, %xmm13, %xmm13
pxor %xmm14, %xmm14
@@ -39081,7 +39081,7 @@ _sp_256_get_point_33_avx2_4:
movd %edx, %xmm7
addq $200, %rsi
movd %eax, %xmm9
movq $33, %rax
movq $32, %rax
vpxor %ymm8, %ymm8, %ymm8
vpermd %ymm7, %ymm8, %ymm7
vpermd %ymm9, %ymm8, %ymm9
@@ -39472,7 +39472,7 @@ _sp_256_get_entry_64_4:
movd %edx, %xmm9
addq $64, %rsi
movd %eax, %xmm11
movq $64, %rax
movq $63, %rax
pshufd $0, %xmm11, %xmm11
pshufd $0, %xmm9, %xmm9
pxor %xmm10, %xmm10
@@ -39575,7 +39575,7 @@ _sp_256_get_entry_65_4:
movd %edx, %xmm9
addq $64, %rsi
movd %eax, %xmm11
movq $65, %rax
movq $64, %rax
pshufd $0, %xmm11, %xmm11
pshufd $0, %xmm9, %xmm9
pxor %xmm10, %xmm10
@@ -42016,7 +42016,7 @@ _sp_384_get_point_33_6:
movd %edx, %xmm13
addq $296, %rsi
movd %eax, %xmm15
movq $33, %rax
movq $32, %rax
pshufd $0, %xmm15, %xmm15
pshufd $0, %xmm13, %xmm13
pxor %xmm14, %xmm14
@@ -42060,9 +42060,9 @@ L_384_get_point_33_6_start:
movdqu %xmm5, 128(%rdi)
movq $1, %rax
movd %edx, %xmm13
addq $296, %rsi
subq $9472, %rsi
movd %eax, %xmm15
movq $33, %rax
movq $32, %rax
pshufd $0, %xmm15, %xmm15
pshufd $0, %xmm13, %xmm13
pxor %xmm14, %xmm14
@@ -42113,7 +42113,7 @@ _sp_384_get_point_33_avx2_6:
movd %edx, %xmm13
addq $296, %rsi
movd %eax, %xmm15
movq $33, %rax
movq $32, %rax
vpxor %ymm14, %ymm14, %ymm14
vpermd %ymm13, %ymm14, %ymm13
vpermd %ymm15, %ymm14, %ymm15
@@ -42888,7 +42888,7 @@ _sp_384_get_entry_256_6:
movd %edx, %xmm13
addq $96, %rsi
movd %eax, %xmm15
movq $256, %rax
movq $255, %rax
pshufd $0, %xmm15, %xmm15
pshufd $0, %xmm13, %xmm13
pxor %xmm14, %xmm14