feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #1122 from JacobBarthelmeh/Compatibility-Layer

Browse Source 
using memory bio with no filesystem and adjustment for Windows line e…
This commit is contained in:
toddouska
2017-08-30 10:58:30 -07:00
committed by GitHub
parent 34dc4a493d a8417c1078
commit 1ba77e4306
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ssl.c
View File

@ -22890,7 +22890,6 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl)
WOLFSSL_X509 *wolfSSL_PEM_read_bio_X509(WOLFSSL_BIO *bp, WOLFSSL_X509 **x, WOLFSSL_X509 *wolfSSL_PEM_read_bio_X509(WOLFSSL_BIO *bp, WOLFSSL_X509 **x,
pem_password_cb *cb, void *u) pem_password_cb *cb, void *u)
{ {
#ifndef NO_FILESYSTEM
WOLFSSL_X509* x509 = NULL; WOLFSSL_X509* x509 = NULL;
unsigned char* pem = NULL; unsigned char* pem = NULL;
int pemSz; int pemSz;
@ -22911,6 +22910,7 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl)
} }
} }
else if (bp->type == BIO_FILE) { else if (bp->type == BIO_FILE) {
#ifndef NO_FILESYSTEM
/* Read in next certificate from file but no more. */ /* Read in next certificate from file but no more. */
i = XFTELL(bp->file); i = XFTELL(bp->file);
if (i < 0) if (i < 0)
@ -22920,6 +22920,10 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl)
if (l < 0) if (l < 0)
return NULL; return NULL;
XFSEEK(bp->file, i, SEEK_SET); XFSEEK(bp->file, i, SEEK_SET);
#else
WOLFSSL_MSG("Unable to read file with NO_FILESYSTEM defined");
return NULL;
#endif
} }
else else
return NULL; return NULL;
@ -22937,8 +22941,14 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl)
*/ */
while ((l = wolfSSL_BIO_read(bp, (char *)&pem[i], 1)) == 1) { while ((l = wolfSSL_BIO_read(bp, (char *)&pem[i], 1)) == 1) {
i++; i++;
if (i > 26 && XMEMCMP((char *)&pem[i-26], END_CERT, 25) == 0) if (i > 26 && XMEMCMP((char *)&pem[i-26], END_CERT, 25) == 0) {
if (pem[i-1] == '\r') {
/* found \r , Windows line ending is \r\n so try to read one
* more byte for \n */
wolfSSL_BIO_read(bp, (char *)&pem[i++], 1);
}
break; break;
}
} }
#ifdef WOLFSSL_NGINX #ifdef WOLFSSL_NGINX
if (l == 0) if (l == 0)
@ -22958,13 +22968,6 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl)
(void)u; (void)u;
return x509; return x509;
#else
(void)bp;
(void)x;
(void)cb;
(void)u;
return NULL;
#endif
} }