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

add NO_STDIO_FILESYSTEM to exclude FILE usage from non standard filesystems

Browse Source
This commit is contained in:
Chris Conlon
2014-02-14 14:57:43 -07:00
parent bc3fc658bb
commit 85a47b4596
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cyassl/ctaocrypt/port.h
View File

@ -111,6 +111,7 @@ CYASSL_LOCAL int LockMutex(CyaSSL_Mutex*);
CYASSL_LOCAL int UnLockMutex(CyaSSL_Mutex*); CYASSL_LOCAL int UnLockMutex(CyaSSL_Mutex*);
/* filesystem abstraction layer, used by ssl.c */
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
#if defined(EBSNET) #if defined(EBSNET)

8
cyassl/ssl.h
View File

@ -619,7 +619,7 @@ enum {
/* extras end */ /* extras end */
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM)
/* CyaSSL extension, provide last error from SSL_get_error /* CyaSSL extension, provide last error from SSL_get_error
since not using thread storage error queue */ since not using thread storage error queue */
CYASSL_API void CyaSSL_ERR_print_errors_fp(FILE*, int err); CYASSL_API void CyaSSL_ERR_print_errors_fp(FILE*, int err);
@ -824,8 +824,10 @@ CYASSL_API char* CyaSSL_X509_get_next_altname(CYASSL_X509*);
CYASSL_API CYASSL_X509* CYASSL_API CYASSL_X509*
CyaSSL_X509_d2i(CYASSL_X509** x509, const unsigned char* in, int len); CyaSSL_X509_d2i(CYASSL_X509** x509, const unsigned char* in, int len);
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
CYASSL_API CYASSL_X509* #ifndef NO_STDIO_FILESYSTEM
CyaSSL_X509_d2i_fp(CYASSL_X509** x509, FILE* file); CYASSL_API CYASSL_X509*
CyaSSL_X509_d2i_fp(CYASSL_X509** x509, FILE* file);
#endif
CYASSL_API CYASSL_X509* CYASSL_API CYASSL_X509*
CyaSSL_X509_load_certificate_file(const char* fname, int format); CyaSSL_X509_load_certificate_file(const char* fname, int format);
#endif #endif

6
src/ssl.c
View File

@ -1231,7 +1231,7 @@ int CyaSSL_KeyPemToDer(const unsigned char* pem, int pemSz, unsigned char* buff,
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM)
void CyaSSL_ERR_print_errors_fp(FILE* fp, int err) void CyaSSL_ERR_print_errors_fp(FILE* fp, int err)
{ {
@ -7877,6 +7877,8 @@ CYASSL_X509* CyaSSL_X509_d2i(CYASSL_X509** x509, const byte* in, int len)
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
#ifndef NO_STDIO_FILESYSTEM
CYASSL_X509* CyaSSL_X509_d2i_fp(CYASSL_X509** x509, XFILE file) CYASSL_X509* CyaSSL_X509_d2i_fp(CYASSL_X509** x509, XFILE file)
{ {
CYASSL_X509* newX509 = NULL; CYASSL_X509* newX509 = NULL;
@ -7906,6 +7908,8 @@ CYASSL_X509* CyaSSL_X509_d2i_fp(CYASSL_X509** x509, XFILE file)
return newX509; return newX509;
} }
#endif /* NO_STDIO_FILESYSTEM */
CYASSL_X509* CyaSSL_X509_load_certificate_file(const char* fname, int format) CYASSL_X509* CyaSSL_X509_load_certificate_file(const char* fname, int format)
{ {
byte staticBuffer[FILE_BUFFER_SIZE]; byte staticBuffer[FILE_BUFFER_SIZE];