wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3900 from JacobBarthelmeh/CAAM

Browse Source 
account for leading 0's with r and s during ECC verify
This commit is contained in:
David Garske
2021-03-22 09:08:44 -07:00
committed by GitHub
parent 24b67599c8 b7ac12edb6
commit 3accd4dd86
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
wolfcrypt/src/port/caam/wolfcaam_ecdsa.c
View File

@@ -97,7 +97,6 @@ int wc_CAAM_EccSign(const byte* in, int inlen, byte* out, word32* outlen,
word32 ecdsel = 0; word32 ecdsel = 0;
byte r[MAX_ECC_BYTES] = {0}; byte r[MAX_ECC_BYTES] = {0};
byte s[MAX_ECC_BYTES] = {0}; byte s[MAX_ECC_BYTES] = {0};
word32 outSz;
word32 idx = 0; word32 idx = 0;
byte pk[MAX_ECC_BYTES] = {0}; byte pk[MAX_ECC_BYTES] = {0};
@@ -127,16 +126,16 @@ int wc_CAAM_EccSign(const byte* in, int inlen, byte* out, word32* outlen,
/* private key */ /* private key */
if (key->blackKey > 0) { if (key->blackKey > 0) {
buf[idx].TheAddress = (CAAM_ADDRESS)key->blackKey; buf[idx].TheAddress = (CAAM_ADDRESS)key->blackKey;
buf[idx].Length = keySz;
args[0] = 1; /* is a black key */ args[0] = 1; /* is a black key */
} }
else { else {
outSz = mp_unsigned_bin_size(&key->k); if (mp_to_unsigned_bin_len(&key->k, pk, keySz) != MP_OKAY) {
mp_to_unsigned_bin(&key->k, pk); return MP_TO_E;
}
buf[idx].TheAddress = (CAAM_ADDRESS)pk; buf[idx].TheAddress = (CAAM_ADDRESS)pk;
buf[idx].Length = outSz;
args[0] = 0; /* non black key */ args[0] = 0; /* non black key */
} }
buf[idx].Length = keySz;
idx++; idx++;
/* hash to sign */ /* hash to sign */
@@ -195,7 +194,7 @@ static int wc_CAAM_EccVerify_ex(mp_int* r, mp_int *s, const byte* hash,
word32 args[4] = {0}; word32 args[4] = {0};
CAAM_BUFFER buf[9] = {0}; CAAM_BUFFER buf[9] = {0};
int ret; int ret;
int rSz, sSz; int keySz;
word32 idx = 0; word32 idx = 0;
word32 ecdsel = 0; word32 ecdsel = 0;
@@ -230,9 +229,8 @@ static int wc_CAAM_EccVerify_ex(mp_int* r, mp_int *s, const byte* hash,
} }
/* Wx,y public key */ /* Wx,y public key */
keySz = wc_ecc_size(key);
if (key->securePubKey > 0) { if (key->securePubKey > 0) {
int keySz = wc_ecc_size(key);
buf[idx].TheAddress = (CAAM_ADDRESS)key->securePubKey; buf[idx].TheAddress = (CAAM_ADDRESS)key->securePubKey;
buf[idx].Length = keySz * 2; buf[idx].Length = keySz * 2;
args[0] = 1; /* using public key in secure memory */ args[0] = 1; /* using public key in secure memory */
@@ -251,18 +249,20 @@ static int wc_CAAM_EccVerify_ex(mp_int* r, mp_int *s, const byte* hash,
buf[idx].Length = hashlen; buf[idx].Length = hashlen;
idx++; idx++;
rSz = mp_unsigned_bin_size(r); if (mp_to_unsigned_bin_len(r, rbuf, keySz) != MP_OKAY) {
mp_to_unsigned_bin(r, rbuf); return MP_TO_E;
}
buf[idx].TheAddress = (CAAM_ADDRESS)rbuf; buf[idx].TheAddress = (CAAM_ADDRESS)rbuf;
buf[idx].Length = rSz; buf[idx].Length = keySz;
idx++; idx++;
sSz = mp_unsigned_bin_size(s); if (mp_to_unsigned_bin_len(s, sbuf, keySz) != MP_OKAY) {
mp_to_unsigned_bin(s, sbuf); return MP_TO_E;
}
buf[idx].TheAddress = (CAAM_ADDRESS)sbuf; buf[idx].TheAddress = (CAAM_ADDRESS)sbuf;
buf[idx].Length = sSz; buf[idx].Length = keySz;
idx++; idx++;
/* temporary scratch buffer, the manual calls for it and HW expects it */ /* temporary scratch buffer, the manual calls for it and HW expects it */
@@ -313,7 +313,6 @@ int wc_CAAM_Ecdh(ecc_key* private_key, ecc_key* public_key, byte* out,
CAAM_BUFFER buf[9] = {0}; CAAM_BUFFER buf[9] = {0};
int ret, keySz; int ret, keySz;
word32 ecdsel = 0; /* ecc parameters in hardware */ word32 ecdsel = 0; /* ecc parameters in hardware */
word32 outSz;
word32 idx = 0; word32 idx = 0;
byte pk[MAX_ECC_BYTES] = {0}; byte pk[MAX_ECC_BYTES] = {0};
@@ -365,16 +364,21 @@ int wc_CAAM_Ecdh(ecc_key* private_key, ecc_key* public_key, byte* out,
/* private key */ /* private key */
if (private_key->blackKey > 0) { if (private_key->blackKey > 0) {
buf[idx].TheAddress = (CAAM_ADDRESS)private_key->blackKey; buf[idx].TheAddress = (CAAM_ADDRESS)private_key->blackKey;
buf[idx].Length = keySz;
args[0] = 1; /* is a black key */ args[0] = 1; /* is a black key */
} }
else { else {
outSz = mp_unsigned_bin_size(&private_key->k); if (keySz > MAX_ECC_BYTES) {
mp_to_unsigned_bin(&private_key->k, pk); return BUFFER_E;
}
if (mp_to_unsigned_bin_len(&private_key->k, pk, keySz) != MP_OKAY) {
return MP_TO_E;
}
buf[idx].TheAddress = (CAAM_ADDRESS)pk; buf[idx].TheAddress = (CAAM_ADDRESS)pk;
buf[idx].Length = outSz;
args[0] = 0; /* non black key */ args[0] = 0; /* non black key */
} }
buf[idx].Length = keySz;
idx++; idx++;
/* output shared secret */ /* output shared secret */