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

Merge pull request #371 from libtom/pr/baseNN-consistent-nul

Browse Source 
consistent NUL byte handling in baseNN_encode
This commit is contained in:
karel-m 2018-03-28 09:30:56 +02:00 committed by GitHub
commit fa759d8ee9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc/base16/base16_encode.c
View File

@ -49,12 +49,12 @@ int base16_encode(const unsigned char *in, unsigned long inlen,
*outlen = x;
return CRYPT_BUFFER_OVERFLOW;
}
*outlen = x;
x--;
*outlen = x; /* returning the length without terminating NUL */
if (caps == 0) alphabet = alphabets[0];
else alphabet = alphabets[1];
x -= 1;
for (i = 0; i < x; i += 2) {
out[i] = alphabet[(in[i/2] >> 4) & 0x0f];
out[i+1] = alphabet[in[i/2] & 0x0f];

2
src/misc/base32/base32_encode.c
View File

@ -45,7 +45,7 @@ int base32_encode(const unsigned char *in, unsigned long inlen,
*outlen = x;
return CRYPT_BUFFER_OVERFLOW;
}
*outlen = x;
*outlen = x - 1; /* returning the length without terminating NUL */
/* no input, nothing to do */
if (inlen == 0) {

2
src/misc/base64/base64_encode.c
View File

@ -73,7 +73,7 @@ static int _base64_encode_internal(const unsigned char *in, unsigned long inlen
*p = '\0';
/* return ok */
*outlen = (unsigned long)(p - out);
*outlen = (unsigned long)(p - out); /* the length without terminating NUL */
return CRYPT_OK;
}

2
tests/base16_test.c
View File

@ -29,7 +29,6 @@ int base16_test(void)
yarrow_read(in, x, &yarrow_prng);
l1 = sizeof(out);
DO(base16_encode(in, x, out, &l1, idx));
l1--;
l2 = sizeof(tmp);
DO(base16_decode(out, l1, tmp, &l2));
DO(do_compare_testvector(tmp, l2, in, x, "random base16", idx * 100 + x));
@ -40,7 +39,6 @@ int base16_test(void)
l1 = sizeof(out);
DO(base16_encode(testin, sizeof(testin), out, &l1, idx));
DO(do_compare_testvector(out, strlen(out), testout[idx], strlen(testout[idx]), "testout base16", idx));
l1--;
l2 = sizeof(tmp);
DO(base16_decode(out, l1, tmp, &l2));
DO(do_compare_testvector(tmp, l2, testin, sizeof(testin), "testin base16", idx));

6
tests/base32_test.c
View File

@ -37,7 +37,7 @@ int base32_test(void)
l1 = sizeof(out);
DO(base32_encode(in, x, out, &l1, testid[idx]));
l2 = sizeof(tmp);
DO(base32_decode(out, strlen(out), tmp, &l2, testid[idx]));
DO(base32_decode(out, l1, tmp, &l2, testid[idx]));
DO(do_compare_testvector(tmp, l2, in, x, "random base32", idx * 100 + x));
}
}
@ -45,9 +45,9 @@ int base32_test(void)
for (idx = 0; idx < 4; idx++) {
l1 = sizeof(out);
DO(base32_encode(testin, sizeof(testin), out, &l1, testid[idx]));
DO(do_compare_testvector(out, strlen(out), testout[idx], strlen(testout[idx]), "testout base32", idx));
DO(do_compare_testvector(out, l1, testout[idx], strlen(testout[idx]), "testout base32", idx));
l2 = sizeof(tmp);
DO(base32_decode(out, strlen(out), tmp, &l2, testid[idx]));
DO(base32_decode(out, l1, tmp, &l2, testid[idx]));
DO(do_compare_testvector(tmp, l2, testin, sizeof(testin), "testin base32", idx));
}