kris/pqc
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #250 from PQClean/rainbow_memcpy

Browse Source 
Rainbow: memcpy -> memmove since buffers may overlap
This commit is contained in:
mergify[bot] 2019-11-13 19:27:51 +00:00 committed by GitHub
commit 130189f6fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto_sign/rainbowIIIc-classic/clean/sign.c
View File

@ -44,7 +44,7 @@ int PQCLEAN_RAINBOWIIICCLASSIC_CLEAN_crypto_sign_open(unsigned char *m, size_t *
rc = PQCLEAN_RAINBOWIIICCLASSIC_CLEAN_rainbow_verify(digest, sm + mlen[0], (const pk_t *)pk); rc = PQCLEAN_RAINBOWIIICCLASSIC_CLEAN_rainbow_verify(digest, sm + mlen[0], (const pk_t *)pk);
} }
if (!rc) { if (!rc) {
memcpy(m, sm, smlen - _SIGNATURE_BYTE); memmove(m, sm, smlen - _SIGNATURE_BYTE);
} else { // bad signature } else { // bad signature
*mlen = (size_t) -1; *mlen = (size_t) -1;
memset(m, 0, smlen); memset(m, 0, smlen);

2
crypto_sign/rainbowIIIc-cyclic-compressed/clean/sign.c
View File

@ -46,7 +46,7 @@ int PQCLEAN_RAINBOWIIICCYCLICCOMPRESSED_CLEAN_crypto_sign_open(unsigned char *m,
rc = PQCLEAN_RAINBOWIIICCYCLICCOMPRESSED_CLEAN_rainbow_verify_cyclic(digest, sm + mlen[0], (const cpk_t *)pk); rc = PQCLEAN_RAINBOWIIICCYCLICCOMPRESSED_CLEAN_rainbow_verify_cyclic(digest, sm + mlen[0], (const cpk_t *)pk);
} }
if (!rc) { if (!rc) {
memcpy(m, sm, smlen - _SIGNATURE_BYTE); memmove(m, sm, smlen - _SIGNATURE_BYTE);
} else { // bad signature } else { // bad signature
*mlen = (size_t) -1; *mlen = (size_t) -1;
memset(m, 0, smlen); memset(m, 0, smlen);

2
crypto_sign/rainbowIIIc-cyclic/clean/sign.c
View File

@ -46,7 +46,7 @@ int PQCLEAN_RAINBOWIIICCYCLIC_CLEAN_crypto_sign_open(unsigned char *m, size_t *m
rc = PQCLEAN_RAINBOWIIICCYCLIC_CLEAN_rainbow_verify_cyclic(digest, sm + mlen[0], (const cpk_t *)pk); rc = PQCLEAN_RAINBOWIIICCYCLIC_CLEAN_rainbow_verify_cyclic(digest, sm + mlen[0], (const cpk_t *)pk);
} }
if (!rc) { if (!rc) {
memcpy(m, sm, smlen - _SIGNATURE_BYTE); memmove(m, sm, smlen - _SIGNATURE_BYTE);
} else { // bad signature } else { // bad signature
*mlen = (size_t) -1; *mlen = (size_t) -1;
memset(m, 0, smlen); memset(m, 0, smlen);

2
crypto_sign/rainbowIa-classic/clean/sign.c
View File

@ -44,7 +44,7 @@ int PQCLEAN_RAINBOWIACLASSIC_CLEAN_crypto_sign_open(unsigned char *m, size_t *ml
rc = PQCLEAN_RAINBOWIACLASSIC_CLEAN_rainbow_verify(digest, sm + mlen[0], (const pk_t *)pk); rc = PQCLEAN_RAINBOWIACLASSIC_CLEAN_rainbow_verify(digest, sm + mlen[0], (const pk_t *)pk);
} }
if (!rc) { if (!rc) {
memcpy(m, sm, smlen - _SIGNATURE_BYTE); memmove(m, sm, smlen - _SIGNATURE_BYTE);
} else { // bad signature } else { // bad signature
*mlen = (size_t) -1; *mlen = (size_t) -1;
memset(m, 0, smlen); memset(m, 0, smlen);

2
crypto_sign/rainbowIa-cyclic-compressed/clean/sign.c
View File

@ -46,7 +46,7 @@ int PQCLEAN_RAINBOWIACYCLICCOMPRESSED_CLEAN_crypto_sign_open(unsigned char *m, s
rc = PQCLEAN_RAINBOWIACYCLICCOMPRESSED_CLEAN_rainbow_verify_cyclic(digest, sm + mlen[0], (const cpk_t *)pk); rc = PQCLEAN_RAINBOWIACYCLICCOMPRESSED_CLEAN_rainbow_verify_cyclic(digest, sm + mlen[0], (const cpk_t *)pk);
} }
if (!rc) { if (!rc) {
memcpy(m, sm, smlen - _SIGNATURE_BYTE); memmove(m, sm, smlen - _SIGNATURE_BYTE);
} else { // bad signature } else { // bad signature
*mlen = (size_t) -1; *mlen = (size_t) -1;
memset(m, 0, smlen); memset(m, 0, smlen);

2
crypto_sign/rainbowIa-cyclic/clean/sign.c
View File

@ -46,7 +46,7 @@ int PQCLEAN_RAINBOWIACYCLIC_CLEAN_crypto_sign_open(unsigned char *m, size_t *mle
rc = PQCLEAN_RAINBOWIACYCLIC_CLEAN_rainbow_verify_cyclic(digest, sm + mlen[0], (const cpk_t *)pk); rc = PQCLEAN_RAINBOWIACYCLIC_CLEAN_rainbow_verify_cyclic(digest, sm + mlen[0], (const cpk_t *)pk);
} }
if (!rc) { if (!rc) {
memcpy(m, sm, smlen - _SIGNATURE_BYTE); memmove(m, sm, smlen - _SIGNATURE_BYTE);
} else { // bad signature } else { // bad signature
*mlen = (size_t) -1; *mlen = (size_t) -1;
memset(m, 0, smlen); memset(m, 0, smlen);

2
crypto_sign/rainbowVc-classic/clean/sign.c
View File

@ -44,7 +44,7 @@ int PQCLEAN_RAINBOWVCCLASSIC_CLEAN_crypto_sign_open(unsigned char *m, size_t *ml
rc = PQCLEAN_RAINBOWVCCLASSIC_CLEAN_rainbow_verify(digest, sm + mlen[0], (const pk_t *)pk); rc = PQCLEAN_RAINBOWVCCLASSIC_CLEAN_rainbow_verify(digest, sm + mlen[0], (const pk_t *)pk);
} }
if (!rc) { if (!rc) {
memcpy(m, sm, smlen - _SIGNATURE_BYTE); memmove(m, sm, smlen - _SIGNATURE_BYTE);
} else { // bad signature } else { // bad signature
*mlen = (size_t) -1; *mlen = (size_t) -1;
memset(m, 0, smlen); memset(m, 0, smlen);

2
crypto_sign/rainbowVc-cyclic-compressed/clean/sign.c
View File

@ -46,7 +46,7 @@ int PQCLEAN_RAINBOWVCCYCLICCOMPRESSED_CLEAN_crypto_sign_open(unsigned char *m, s
rc = PQCLEAN_RAINBOWVCCYCLICCOMPRESSED_CLEAN_rainbow_verify_cyclic(digest, sm + mlen[0], (const cpk_t *)pk); rc = PQCLEAN_RAINBOWVCCYCLICCOMPRESSED_CLEAN_rainbow_verify_cyclic(digest, sm + mlen[0], (const cpk_t *)pk);
} }
if (!rc) { if (!rc) {
memcpy(m, sm, smlen - _SIGNATURE_BYTE); memmove(m, sm, smlen - _SIGNATURE_BYTE);
} else { // bad signature } else { // bad signature
*mlen = (size_t) -1; *mlen = (size_t) -1;
memset(m, 0, smlen); memset(m, 0, smlen);

2
crypto_sign/rainbowVc-cyclic/clean/sign.c
View File

@ -46,7 +46,7 @@ int PQCLEAN_RAINBOWVCCYCLIC_CLEAN_crypto_sign_open(unsigned char *m, size_t *mle
rc = PQCLEAN_RAINBOWVCCYCLIC_CLEAN_rainbow_verify_cyclic(digest, sm + mlen[0], (const cpk_t *)pk); rc = PQCLEAN_RAINBOWVCCYCLIC_CLEAN_rainbow_verify_cyclic(digest, sm + mlen[0], (const cpk_t *)pk);
} }
if (!rc) { if (!rc) {
memcpy(m, sm, smlen - _SIGNATURE_BYTE); memmove(m, sm, smlen - _SIGNATURE_BYTE);
} else { // bad signature } else { // bad signature
*mlen = (size_t) -1; *mlen = (size_t) -1;
memset(m, 0, smlen); memset(m, 0, smlen);