feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #1897 from WolfWalter/fix_sigrs_length

Browse Source 
ATECC508 reference PK callback fix for signature length
This commit is contained in:
David Garske
2018-10-29 08:54:46 -07:00
committed by GitHub
parent ae07ba93ad a47eeec145
commit ba90674357
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wolfcrypt/src/port/atmel/atmel.c
View File

@ -660,7 +660,7 @@ int atcatls_sign_certificate_cb(WOLFSSL* ssl, const byte* in, word32 inSz,
byte* out, word32* outSz, const byte* key, word32 keySz, void* ctx) byte* out, word32* outSz, const byte* key, word32 keySz, void* ctx)
{ {
int ret; int ret;
byte sigRs[ATECC_SIG_SIZE*2]; byte sigRs[ATECC_SIG_SIZE];
int slotId; int slotId;
(void)ssl; (void)ssl;
@ -690,8 +690,8 @@ int atcatls_sign_certificate_cb(WOLFSSL* ssl, const byte* in, word32 inSz,
/* Encode with ECDSA signature */ /* Encode with ECDSA signature */
ret = wc_ecc_rs_raw_to_sig( ret = wc_ecc_rs_raw_to_sig(
&sigRs[0], ATECC_SIG_SIZE, &sigRs[0], ATECC_SIG_SIZE/2,
&sigRs[ATECC_SIG_SIZE], ATECC_SIG_SIZE, &sigRs[ATECC_SIG_SIZE/2], ATECC_SIG_SIZE/2,
out, outSz); out, outSz);
if (ret != 0) { if (ret != 0) {
goto exit; goto exit;
@ -724,9 +724,9 @@ int atcatls_verify_signature_cb(WOLFSSL* ssl, const byte* sig, word32 sigSz,
uint8_t* qx = &peerKey[0]; uint8_t* qx = &peerKey[0];
uint8_t* qy = &peerKey[ATECC_PUBKEY_SIZE/2]; uint8_t* qy = &peerKey[ATECC_PUBKEY_SIZE/2];
word32 qxLen = ATECC_PUBKEY_SIZE/2, qyLen = ATECC_PUBKEY_SIZE/2; word32 qxLen = ATECC_PUBKEY_SIZE/2, qyLen = ATECC_PUBKEY_SIZE/2;
byte sigRs[ATECC_SIG_SIZE*2]; byte sigRs[ATECC_SIG_SIZE];
word32 rSz = ATECC_SIG_SIZE; word32 rSz = ATECC_SIG_SIZE/2;
word32 sSz = ATECC_SIG_SIZE; word32 sSz = ATECC_SIG_SIZE/2;
(void)sigSz; (void)sigSz;
(void)hashSz; (void)hashSz;
@ -753,7 +753,7 @@ int atcatls_verify_signature_cb(WOLFSSL* ssl, const byte* sig, word32 sigSz,
/* decode the ECDSA signature */ /* decode the ECDSA signature */
ret = wc_ecc_sig_to_rs(sig, sigSz, ret = wc_ecc_sig_to_rs(sig, sigSz,
&sigRs[0], &rSz, &sigRs[0], &rSz,
&sigRs[ATECC_SIG_SIZE], &sSz); &sigRs[ATECC_SIG_SIZE/2], &sSz);
if (ret != 0) { if (ret != 0) {
goto exit; goto exit;
} }