Merge branch 'PIC32MZ-HWCrypt'
Conflicts: configure.ac ctaocrypt/benchmark/benchmark.c ctaocrypt/src/asn.c ctaocrypt/src/coding.c ctaocrypt/src/des3.c ctaocrypt/src/md5.c ctaocrypt/src/random.c ctaocrypt/src/sha.c ctaocrypt/src/sha256.c cyassl/ctaocrypt/aes.h cyassl/ctaocrypt/settings.h cyassl/ssl.h cyassl/version.h examples/server/server.c m4/ax_debug.m4 m4/ax_tls.m4 mplabx/benchmark_main.c mplabx/ctaocrypt_test.X/nbproject/configurations.xml mplabx/test_main.c src/io.c src/ocsp.c src/ssl.c src/tls.c testsuite/testsuite.c
This commit is contained in:
@@ -240,6 +240,11 @@ static int DoBase64_Encode(const byte* in, word32 inLen, byte* out,
|
||||
|
||||
outSz += addSz;
|
||||
|
||||
if (escaped)
|
||||
addSz *= 3; /* instead of just \n, we're doing %0A triplet */
|
||||
|
||||
outSz += addSz;
|
||||
|
||||
/* if escaped we can't predetermine size for one pass encoding, but
|
||||
* make sure we have enough if no escapes are in input */
|
||||
if (outSz > *outLen) return BAD_FUNC_ARG;
|
||||
|
||||
Reference in New Issue
Block a user