generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stop checking for CRLF when start of buffer is reached.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2003-06-02 01:03:08 +00:00
parent 3410aa1aa8
commit bb41fdb5ec
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/pkcs7/pk7_mime.c
View File

@ -333,11 +333,12 @@ int SMIME_crlf_copy(BIO *in, BIO *out, int flags)
if(flags & PKCS7_TEXT) BIO_printf(out, "Content-Type: text/plain\r\n\r\n"); if(flags & PKCS7_TEXT) BIO_printf(out, "Content-Type: text/plain\r\n\r\n");
while ((len = BIO_gets(in, linebuf, MAX_SMLEN)) > 0) { while ((len = BIO_gets(in, linebuf, MAX_SMLEN)) > 0) {
eol = 0; eol = 0;
while(iscrlf(linebuf[len - 1])) { while(len && iscrlf(linebuf[len - 1])) {
len--; len--;
eol = 1; eol = 1;
} }
BIO_write(out, linebuf, len); if (len)
BIO_write(out, linebuf, len);
if(eol) BIO_write(out, "\r\n", 2); if(eol) BIO_write(out, "\r\n", 2);
} }
return 1; return 1;
@ -402,7 +403,7 @@ static int multi_split(BIO *bio, char *bound, STACK_OF(BIO) **ret)
} else if(part) { } else if(part) {
/* Strip CR+LF from linebuf */ /* Strip CR+LF from linebuf */
next_eol = 0; next_eol = 0;
while(iscrlf(linebuf[len - 1])) { while(len && iscrlf(linebuf[len - 1])) {
next_eol = 1; next_eol = 1;
len--; len--;
} }
@ -413,7 +414,8 @@ static int multi_split(BIO *bio, char *bound, STACK_OF(BIO) **ret)
} else if (eol) } else if (eol)
BIO_write(bpart, "\r\n", 2); BIO_write(bpart, "\r\n", 2);
eol = next_eol; eol = next_eol;
BIO_write(bpart, linebuf, len); if (len)
BIO_write(bpart, linebuf, len);
} }
} }
return 0; return 0;