Merge branch 'master' into ti

This commit is contained in:
toddouska
2014-06-16 12:31:24 -07:00

View File

@ -1771,7 +1771,7 @@ int CyaSSL_Init(void)
{ {
/* remove encrypted header if there */ /* remove encrypted header if there */
char encHeader[] = "Proc-Type"; char encHeader[] = "Proc-Type";
char* line = XSTRNSTR((char*)buff, encHeader, PEM_LINE_LEN); char* line = XSTRNSTR(headerEnd, encHeader, PEM_LINE_LEN);
if (line) { if (line) {
char* newline; char* newline;
char* finish; char* finish;