TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re-work strict/relaxed base64 decoding implementation

Browse Source 
Instead of one API function with an option parameter, provide two API
functions.
Instead of defaulting to strict decoding, default to relaxed decoding.
This commit is contained in:
Steffen Jaeckel
2017-02-17 11:18:58 +01:00
committed by Karel Miko
parent 53359ccfc6
commit c1dd1cbe30
7 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testprof/base64_test.c
+8 -5
View File
@@ -34,7 +34,7 @@ int base64_test(void)
const struct {
const char* s;
int mode;
int is_strict;
} url_cases[] = {
{"vuiSPKIl8PiR5O-rC4z9_xTQKZ0", 0},
{"vuiSPKIl8PiR5O-rC4z9_xTQKZ0=", 1},
@@ -63,7 +63,10 @@ int base64_test(void)
for (x = 0; x < sizeof(url_cases)/sizeof(url_cases[0]); ++x) {
slen1 = strlen(url_cases[x].s);
l1 = sizeof(out);
DO(base64url_decode_ex((unsigned char*)url_cases[x].s, slen1, out, &l1, url_cases[x].mode));
if(url_cases[x].is_strict)
DO(base64url_strict_decode((unsigned char*)url_cases[x].s, slen1, out, &l1));
else
DO(base64url_decode((unsigned char*)url_cases[x].s, slen1, out, &l1));
if (l1 != strlen(special_case) || memcmp(out, special_case, l1)) {
fprintf(stderr, "\nbase64url failed case %lu: %s", x, url_cases[x].s);
print_hex("\nbase64url should", special_case, strlen(special_case));
@@ -91,16 +94,16 @@ int base64_test(void)
out[10] = '\0';
l1++;
l2 = sizeof(tmp);
DO(base64_decode_ex(out, l1, tmp, &l2, 0));
DO(base64_decode(out, l1, tmp, &l2));
if (l2 != x || memcmp(tmp, in, x)) {
fprintf(stderr, "loose base64 decoding failed %lu %lu %lu", x, l1, l2);
fprintf(stderr, "relaxed base64 decoding failed %lu %lu %lu", x, l1, l2);
print_hex("is ", tmp, l2);
print_hex("should", in, x);
print_hex("input ", out, l1);
return 1;
}
l2 = sizeof(tmp);
DO(base64_decode_ex(out, l1, tmp, &l2, 1) == CRYPT_INVALID_PACKET ? CRYPT_OK : CRYPT_INVALID_PACKET);
DO(base64_strict_decode(out, l1, tmp, &l2) == CRYPT_INVALID_PACKET ? CRYPT_OK : CRYPT_INVALID_PACKET);
return 0;
}
#endif
testprof/der_tests.c
+1 -1
View File
@@ -392,7 +392,7 @@ static void der_cacert_test(void)
ltc_asn1_list *decoded_list, *l, *l1, *l2;
DO(base64_decode_ex(_der_tests_cacert_root_cert, sizeof(_der_tests_cacert_root_cert), buf, &len1, 0));
DO(base64_decode(_der_tests_cacert_root_cert, sizeof(_der_tests_cacert_root_cert), buf, &len1));
len2 = len1;
DO(der_decode_sequence_flexi(buf, &len2, &decoded_list));