WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1594 from kojo1/openSSL-Compat-CRL-STORE 

FILE* to XFILE
pull/1610/head
David Garske 2018-06-06 16:34:59 -07:00 committed by GitHub
parent 596cedc226 3ff8c45aa8
commit e673cdf2d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/dox_comments/header_files/ssl.h
View File

@ -5599,7 +5599,7 @@ WOLFSSL_API int wolfSSL_X509_version(WOLFSSL_X509*);
\sa XFSEEK \sa XFSEEK
*/ */
WOLFSSL_API WOLFSSL_X509* WOLFSSL_API WOLFSSL_X509*
wolfSSL_X509_d2i_fp(WOLFSSL_X509** x509, FILE* file); wolfSSL_X509_d2i_fp(WOLFSSL_X509** x509, XFILE file);
/*! /*!
\ingroup CertsKeys \ingroup CertsKeys

8
src/ssl.c
View File

@ -3366,7 +3366,7 @@ void wolfSSL_EVP_init(void)
#if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM) #if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM)
void wolfSSL_ERR_print_errors_fp(FILE* fp, int err) void wolfSSL_ERR_print_errors_fp(XFILE fp, int err)
{ {
char data[WOLFSSL_MAX_ERROR_SZ + 1]; char data[WOLFSSL_MAX_ERROR_SZ + 1];
@ -3376,7 +3376,7 @@ void wolfSSL_ERR_print_errors_fp(FILE* fp, int err)
} }
#if defined(OPENSSL_EXTRA) || defined(DEBUG_WOLFSSL_VERBOSE) #if defined(OPENSSL_EXTRA) || defined(DEBUG_WOLFSSL_VERBOSE)
void wolfSSL_ERR_dump_errors_fp(FILE* fp) void wolfSSL_ERR_dump_errors_fp(XFILE fp)
{ {
wc_ERR_print_errors_fp(fp); wc_ERR_print_errors_fp(fp);
} }
@ -22526,7 +22526,7 @@ char *wolfSSL_BN_bn2hex(const WOLFSSL_BIGNUM *bn)
/* return code compliant with OpenSSL : /* return code compliant with OpenSSL :
* 1 if success, 0 if error * 1 if success, 0 if error
*/ */
int wolfSSL_BN_print_fp(FILE *fp, const WOLFSSL_BIGNUM *bn) int wolfSSL_BN_print_fp(XFILE fp, const WOLFSSL_BIGNUM *bn)
{ {
#if defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) || defined(DEBUG_WOLFSSL) #if defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) || defined(DEBUG_WOLFSSL)
char *buf; char *buf;
@ -28684,7 +28684,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
} }
#if defined(HAVE_CRL) && !defined(NO_FILESYSTEM) #if defined(HAVE_CRL) && !defined(NO_FILESYSTEM)
WOLFSSL_API WOLFSSL_X509_CRL* wolfSSL_PEM_read_X509_CRL(FILE *fp, WOLFSSL_X509_CRL **crl, WOLFSSL_API WOLFSSL_X509_CRL* wolfSSL_PEM_read_X509_CRL(XFILE fp, WOLFSSL_X509_CRL **crl,
pem_password_cb *cb, void *u) pem_password_cb *cb, void *u)
{ {
#if defined(WOLFSSL_PEM_TO_DER) || defined(WOLFSSL_DER_TO_PEM) #if defined(WOLFSSL_PEM_TO_DER) || defined(WOLFSSL_DER_TO_PEM)

2
wolfcrypt/src/logging.c
View File

@ -711,7 +711,7 @@ int wc_ERR_remove_state(void)
#if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM) #if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM)
/* empties out the error queue into the file */ /* empties out the error queue into the file */
void wc_ERR_print_errors_fp(FILE* fp) void wc_ERR_print_errors_fp(XFILE fp)
{ {
WOLFSSL_ENTER("wc_ERR_print_errors_fp"); WOLFSSL_ENTER("wc_ERR_print_errors_fp");

2
wolfssl/openssl/bn.h
View File

@ -110,7 +110,7 @@ WOLFSSL_API int wolfSSL_BN_is_prime_ex(const WOLFSSL_BIGNUM*, int,
WOLFSSL_API WOLFSSL_BN_ULONG wolfSSL_BN_mod_word(const WOLFSSL_BIGNUM*, WOLFSSL_API WOLFSSL_BN_ULONG wolfSSL_BN_mod_word(const WOLFSSL_BIGNUM*,
WOLFSSL_BN_ULONG); WOLFSSL_BN_ULONG);
#if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM) #if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM)
WOLFSSL_API int wolfSSL_BN_print_fp(FILE*, const WOLFSSL_BIGNUM*); WOLFSSL_API int wolfSSL_BN_print_fp(XFILE, const WOLFSSL_BIGNUM*);
#endif #endif
WOLFSSL_API int wolfSSL_BN_rshift(WOLFSSL_BIGNUM*, const WOLFSSL_BIGNUM*, int); WOLFSSL_API int wolfSSL_BN_rshift(WOLFSSL_BIGNUM*, const WOLFSSL_BIGNUM*, int);
WOLFSSL_API WOLFSSL_BIGNUM *wolfSSL_BN_CTX_get(WOLFSSL_BN_CTX *ctx); WOLFSSL_API WOLFSSL_BIGNUM *wolfSSL_BN_CTX_get(WOLFSSL_BN_CTX *ctx);

8
wolfssl/ssl.h
View File

@ -1227,9 +1227,9 @@ enum {
/* wolfSSL extension, provide last error from SSL_get_error /* wolfSSL extension, provide last error from SSL_get_error
since not using thread storage error queue */ since not using thread storage error queue */
#include <stdio.h> #include <stdio.h>
WOLFSSL_API void wolfSSL_ERR_print_errors_fp(FILE*, int err); WOLFSSL_API void wolfSSL_ERR_print_errors_fp(XFILE, int err);
#if defined(OPENSSL_EXTRA) || defined(DEBUG_WOLFSSL_VERBOSE) #if defined(OPENSSL_EXTRA) || defined(DEBUG_WOLFSSL_VERBOSE)
WOLFSSL_API void wolfSSL_ERR_dump_errors_fp(FILE* fp); WOLFSSL_API void wolfSSL_ERR_dump_errors_fp(XFILE fp);
#endif #endif
#endif #endif
@ -1540,7 +1540,7 @@ WOLFSSL_API void wolfSSL_X509_CRL_free(WOLFSSL_X509_CRL *crl);
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
#ifndef NO_STDIO_FILESYSTEM #ifndef NO_STDIO_FILESYSTEM
WOLFSSL_API WOLFSSL_X509* WOLFSSL_API WOLFSSL_X509*
wolfSSL_X509_d2i_fp(WOLFSSL_X509** x509, FILE* file); wolfSSL_X509_d2i_fp(WOLFSSL_X509** x509, XFILE file);
#endif #endif
WOLFSSL_API WOLFSSL_X509* WOLFSSL_API WOLFSSL_X509*
wolfSSL_X509_load_certificate_file(const char* fname, int format); wolfSSL_X509_load_certificate_file(const char* fname, int format);
@ -2571,7 +2571,7 @@ WOLFSSL_API WOLFSSL_X509 *wolfSSL_PEM_read_bio_X509(WOLFSSL_BIO *bp, WOLFSSL_X50
WOLFSSL_API WOLFSSL_X509 *wolfSSL_PEM_read_bio_X509_AUX WOLFSSL_API WOLFSSL_X509 *wolfSSL_PEM_read_bio_X509_AUX
(WOLFSSL_BIO *bp, WOLFSSL_X509 **x, pem_password_cb *cb, void *u); (WOLFSSL_BIO *bp, WOLFSSL_X509 **x, pem_password_cb *cb, void *u);
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
WOLFSSL_API WOLFSSL_X509_CRL *wolfSSL_PEM_read_X509_CRL(FILE *fp, WOLFSSL_X509_CRL **x, WOLFSSL_API WOLFSSL_X509_CRL *wolfSSL_PEM_read_X509_CRL(XFILE fp, WOLFSSL_X509_CRL **x,
pem_password_cb *cb, void *u); pem_password_cb *cb, void *u);
#endif #endif

2
wolfssl/wolfcrypt/logging.h
View File

@ -112,7 +112,7 @@ WOLFSSL_API void wolfSSL_Debugging_OFF(void);
WOLFSSL_API int wc_SetLoggingHeap(void* h); WOLFSSL_API int wc_SetLoggingHeap(void* h);
WOLFSSL_API int wc_ERR_remove_state(void); WOLFSSL_API int wc_ERR_remove_state(void);
#if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM) #if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM)
WOLFSSL_API void wc_ERR_print_errors_fp(FILE* fp); WOLFSSL_API void wc_ERR_print_errors_fp(XFILE fp);
#endif #endif
#endif /* OPENSSL_EXTRA || DEBUG_WOLFSSL_VERBOSE */ #endif /* OPENSSL_EXTRA || DEBUG_WOLFSSL_VERBOSE */