AuroraMiddleware/libtomcrypt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

padding_depad + PKCS7 - reject invalid pad 0

Browse Source
This commit is contained in:
Karel Miko 2018-10-26 19:46:18 +02:00
parent 2adc261612
commit dee704d063
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/misc/padding/padding_depad.c
View File

@ -36,7 +36,7 @@ int padding_depad(const unsigned char *data, unsigned long *length, unsigned lon
if (type < LTC_PAD_ONE_AND_ZERO) {
pad = data[padded_length - 1];
if (pad > padded_length) return CRYPT_INVALID_ARG;
if (pad > padded_length || pad == 0) return CRYPT_INVALID_ARG;
unpadded_length = padded_length - pad;
} else {

5
tests/padding_test.c
View File

@ -201,10 +201,7 @@ int padding_test(void)
int err;
err = padding_depad(data, &len, (LTC_PAD_PKCS7 | 16));
if (err == CRYPT_OK) {
fprintf(stderr, "XXX-FIXME padding_depad should fail (err=%d len=%lu)\n", err, len);
/* return CRYPT_FAIL_TESTVECTOR; */
}
if (err == CRYPT_OK) return CRYPT_FAIL_TESTVECTOR; /* should fail */
}
return CRYPT_OK;