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

Merge pull request #1202 from dgarske/fix_nofs

Browse Source 
Build fixes for building without filesystem
This commit is contained in:
toddouska
2017-11-01 10:14:22 -07:00
committed by GitHub
parent d8ef0d7df1 fa01c41ea9
commit 57853fa3e9
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ocsp.c
View File

@@ -639,6 +639,7 @@ OcspResponse* wolfSSL_d2i_OCSP_RESPONSE_bio(WOLFSSL_BIO* bio,
return NULL; return NULL;
} }
} }
#ifndef NO_FILESYSTEM
else if (bio->type == BIO_FILE) { else if (bio->type == BIO_FILE) {
long i; long i;
long l; long l;
@@ -663,6 +664,7 @@ OcspResponse* wolfSSL_d2i_OCSP_RESPONSE_bio(WOLFSSL_BIO* bio,
len = wolfSSL_BIO_read(bio, (char *)data, (int)l); len = wolfSSL_BIO_read(bio, (char *)data, (int)l);
} }
#endif
else else
return NULL; return NULL;

11
src/ssl.c
View File

@@ -6864,6 +6864,7 @@ long wolfSSL_CTX_ctrl(WOLFSSL_CTX* ctx, int cmd, long opt, void* pt)
} }
#ifndef NO_CERTS #ifndef NO_CERTS
int wolfSSL_check_private_key(const WOLFSSL* ssl) int wolfSSL_check_private_key(const WOLFSSL* ssl)
{ {
DecodedCert der; DecodedCert der;
@@ -17803,7 +17804,7 @@ char* wolfSSL_X509_get_subjectCN(WOLFSSL_X509* x509)
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
#ifdef FORTRESS #if defined(FORTRESS) && !defined(NO_FILESYSTEM)
int wolfSSL_cmp_peer_cert_to_file(WOLFSSL* ssl, const char *fname) int wolfSSL_cmp_peer_cert_to_file(WOLFSSL* ssl, const char *fname)
{ {
int ret = WOLFSSL_FATAL_ERROR; int ret = WOLFSSL_FATAL_ERROR;
@@ -24218,11 +24219,13 @@ void WOLFSSL_ERR_remove_thread_state(void* pid)
return; return;
} }
#ifndef NO_FILESYSTEM
/***TBD ***/ /***TBD ***/
void wolfSSL_print_all_errors_fp(XFILE *fp) void wolfSSL_print_all_errors_fp(XFILE *fp)
{ {
(void)fp; (void)fp;
} }
#endif
int wolfSSL_SESSION_set_ex_data(WOLFSSL_SESSION* session, int idx, void* data) int wolfSSL_SESSION_set_ex_data(WOLFSSL_SESSION* session, int idx, void* data)
{ {
@@ -25191,8 +25194,14 @@ int wolfSSL_X509_NAME_digest(const WOLFSSL_X509_NAME *name,
if (name == NULL || type == NULL) if (name == NULL || type == NULL)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
#ifndef NO_FILESYSTEM
return wolfSSL_EVP_Digest((unsigned char*)name->fullName.fullName, return wolfSSL_EVP_Digest((unsigned char*)name->fullName.fullName,
name->fullName.fullNameLen, md, len, type, NULL); name->fullName.fullNameLen, md, len, type, NULL);
#else
(void)md;
(void)len;
return NOT_COMPILED_IN;
#endif
} }
long wolfSSL_SSL_CTX_get_timeout(const WOLFSSL_CTX *ctx) long wolfSSL_SSL_CTX_get_timeout(const WOLFSSL_CTX *ctx)

2
wolfcrypt/test/test.c
View File

@@ -933,8 +933,8 @@ static int _SaveDerAndPem(const byte* der, int derSz,
byte* pem, int pemSz, const char* fileDer, byte* pem, int pemSz, const char* fileDer,
const char* filePem, int pemType, int errBase) const char* filePem, int pemType, int errBase)
{ {
int ret;
#if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES) #if !defined(NO_FILESYSTEM) && !defined(NO_WRITE_TEMP_FILES)
int ret;
FILE* derFile; FILE* derFile;
derFile = fopen(fileDer, "wb"); derFile = fopen(fileDer, "wb");