Update - OpenSSL 1.1.1-pre7-dev

2018-05-23 23:52:41 +09:00
parent e8a0afd4a0
commit ef253190c7
624 changed files with 189420 additions and 8064 deletions
@@ -953,12 +953,14 @@ static int strip_eol(char *linebuf, int *plen, int flags)

    for (p = linebuf + len - 1; len > 0; len--, p--) {
        c = *p;
-        if (c == '\n')
+        if (c == '\n') {
            is_eol = 1;
-        else if (is_eol && flags & SMIME_ASCIICRLF && c < 33)
+        } else if (is_eol && flags & SMIME_ASCIICRLF && c == 32) {
+            /* Strip trailing space on a line; 32 == ASCII for ' ' */
            continue;
-        else if (c != '\r')
+        } else if (c != '\r') {
            break;
+        }
    }
    *plen = len;
    return is_eol;