Skip to content

lwc / candidates

Go to a project
Commit 7fe0ba3c by Enrico Pozzobon
Options

fixed new knot implementation memset overflow

parent 694fe7f9
Inline Side-by-side
Showing with 5 additions and 6 deletions
knot/Implementations/crypto_aead/knot128v1/armcortexm_3/encrypt.c
...@@ -237,8 +237,8 @@ int crypto_aead_decrypt(unsigned char *m, unsigned long long *mlen, ...@@ -237,8 +237,8 @@ int crypto_aead_decrypt(unsigned char *m, unsigned long long *mlen,
unpackFormat(tempU8, s); unpackFormat(tempU8, s);
unpackFormat((tempU8+8), (s+2)); unpackFormat((tempU8+8), (s+2));
if (memcmp((void*)tempU8, (void*)c,CRYPTO_ABYTES)) { if (memcmp((void*)tempU8, (void*)c,CRYPTO_ABYTES)) {
memset(m, 0, sizeof(unsigned char) * (*mlen));
*mlen = 0; *mlen = 0;
memset(m, 0, sizeof(unsigned char) * (clen - CRYPTO_ABYTES));
return -1; return -1;
} }
return 0; return 0;
......
knot/Implementations/crypto_aead/knot128v2/armcortexm_3/encrypt.c
...@@ -248,8 +248,8 @@ int crypto_aead_decrypt(unsigned char *m, unsigned long long *mlen, ...@@ -248,8 +248,8 @@ int crypto_aead_decrypt(unsigned char *m, unsigned long long *mlen,
unpackU96FormatToThreePacket(tempU8, s); unpackU96FormatToThreePacket(tempU8, s);
unpackU96FormatToThreePacket((tempU8 + 12), (s + 3)); unpackU96FormatToThreePacket((tempU8 + 12), (s + 3));
if (memcmp((void*)tempU8, (void*)c, CRYPTO_ABYTES)) { if (memcmp((void*)tempU8, (void*)c, CRYPTO_ABYTES)) {
memset(m, 0, sizeof(unsigned char) * (*mlen));
*mlen = 0; *mlen = 0;
memset(m, 0, sizeof(unsigned char) * (clen - CRYPTO_ABYTES));
return -1; return -1;
} }
return 0; return 0;
......
knot/Implementations/crypto_aead/knot192/armcortexm_3/encrypt.c
...@@ -202,8 +202,8 @@ int crypto_aead_decrypt(unsigned char *m, unsigned long long *mlen, ...@@ -202,8 +202,8 @@ int crypto_aead_decrypt(unsigned char *m, unsigned long long *mlen,
unpackU96FormatToThreePacket(tempU8, s); unpackU96FormatToThreePacket(tempU8, s);
unpackU96FormatToThreePacket((tempU8 + 12), (s + 3)); unpackU96FormatToThreePacket((tempU8 + 12), (s + 3));
if (memcmp((void*)tempU8, (void*)c, CRYPTO_ABYTES)) { if (memcmp((void*)tempU8, (void*)c, CRYPTO_ABYTES)) {
memset(m, 0, sizeof(unsigned char) * (*mlen));
*mlen = 0; *mlen = 0;
memset(m, 0, sizeof(unsigned char) * (clen - CRYPTO_ABYTES));
return -1; return -1;
} }
return 0; return 0;
......
knot/Implementations/crypto_aead/knot256/armcortexm_3/encrypt.c
...@@ -320,9 +320,9 @@ int crypto_aead_decrypt( ...@@ -320,9 +320,9 @@ int crypto_aead_decrypt(
unpackU128FormatToFourPacket(tempU8, s); unpackU128FormatToFourPacket(tempU8, s);
unpackU128FormatToFourPacket((tempU8 + 16), (s + 4)); unpackU128FormatToFourPacket((tempU8 + 16), (s + 4));
if (memcmp((void*)tempU8, (void*)c, CRYPTO_ABYTES)) { if (memcmp((void*)tempU8, (void*)c, CRYPTO_ABYTES)) {
memset(m, 0, sizeof(unsigned char) * (*mlen));
*mlen = 0; *mlen = 0;
memset(m, 0, sizeof(unsigned char) * (clen - CRYPTO_ABYTES));
return -1; return -1;
} }
return 0; return 0;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment