Cyclic0007/wolfssl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into os_base64

Browse Source
This commit is contained in:
TakayukiMatsuo
2021-06-16 23:19:52 +09:00
parent 195ca2b3f0 5bb639f6db
commit 9e02655ac4
789 changed files with 278291 additions and 42145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
wolfcrypt/src/coding.c
View File

@@ -1,6 +1,6 @@
/* coding.c
*
* Copyright (C) 2006-2020 wolfSSL Inc.
* Copyright (C) 2006-2021 wolfSSL Inc.
*
* This file is part of wolfSSL.
*
@@ -118,23 +118,40 @@ int Base64_SkipNewline(const byte* in, word32 *inLen,
{
word32 len = *inLen;
word32 j = *outJ;
if (len && (in[j] == ' ' || in[j] == '\r' || in[j] == '\n')) {
byte endLine = in[j++];
byte curChar;
if (len == 0) {
return BUFFER_E;
}
curChar = in[j];
while (len > 1 && curChar == ' ') {
/* skip whitespace in the middle or end of line */
curChar = in[++j];
len--;
while (len && endLine == ' ') { /* allow trailing whitespace */
endLine = in[j++];
len--;
}
if (endLine == '\r') {
}
if (len && (curChar == '\r' || curChar == '\n')) {
j++;
len--;
if (curChar == '\r') {
if (len) {
endLine = in[j++];
curChar = in[j++];
len--;
}
}
if (endLine != '\n') {
if (curChar != '\n') {
WOLFSSL_MSG("Bad end of line in Base64 Decode");
return ASN_INPUT_E;
}
if (len) {
curChar = in[j];
}
}
while (len && curChar == ' ') {
if (--len > 0) {
curChar = in[++j];
}
}
if (!len) {
return BUFFER_E;