wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 03:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

BIO: move APIs out of ssl.c

Browse Source 
Get configuration working: --enable-all CFLAGS=-DNO_BIO
This commit is contained in:
Sean Parkinson
2022-02-23 14:11:30 +10:00
parent fef8a57eb2
commit d33b787993
5 changed files with 1392 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1263
src/bio.c
View File

File diff suppressed because it is too large Load Diff

6
src/internal.c
View File

@@ -11606,22 +11606,20 @@ int LoadCertByIssuer(WOLFSSL_X509_STORE* store, X509_NAME* issuer, int type)
break; break;
} }
} }
#if defined(HAVE_CRL) && !defined(NO_BIO)
else if (type == X509_LU_CRL) { else if (type == X509_LU_CRL) {
#if defined(HAVE_CRL)
ret = wolfSSL_X509_load_crl_file(&store->lookup, filename, ret = wolfSSL_X509_load_crl_file(&store->lookup, filename,
WOLFSSL_FILETYPE_PEM); WOLFSSL_FILETYPE_PEM);
if (ret != WOLFSSL_SUCCESS) { if (ret != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("failed to load CRL"); WOLFSSL_MSG("failed to load CRL");
break; break;
} }
}
#else #else
else if (type == X509_LU_CRL) {
WOLFSSL_MSG("CRL is not supported"); WOLFSSL_MSG("CRL is not supported");
ret = WOLFSSL_FAILURE; ret = WOLFSSL_FAILURE;
break; break;
#endif /* HAVE_CRL */
} }
#endif /* HAVE_CRL && !NO_BIO */
} else } else
break; break;
} }

1397
src/ssl.c
View File

File diff suppressed because it is too large Load Diff

26
tests/api.c
View File

@@ -7914,7 +7914,7 @@ static void test_wolfSSL_PKCS12(void)
*/ */
#if defined(OPENSSL_EXTRA) && !defined(NO_DES3) && !defined(NO_FILESYSTEM) && \ #if defined(OPENSSL_EXTRA) && !defined(NO_DES3) && !defined(NO_FILESYSTEM) && \
!defined(NO_ASN) && !defined(NO_PWDBASED) && !defined(NO_RSA) && \ !defined(NO_ASN) && !defined(NO_PWDBASED) && !defined(NO_RSA) && \
!defined(NO_SHA) && defined(HAVE_PKCS12) !defined(NO_SHA) && defined(HAVE_PKCS12) && !defined(NO_BIO)
byte buf[6000]; byte buf[6000];
char file[] = "./certs/test-servercert.p12"; char file[] = "./certs/test-servercert.p12";
char order[] = "./certs/ecc-rsa-server.p12"; char order[] = "./certs/ecc-rsa-server.p12";
@@ -30292,7 +30292,8 @@ static void test_wolfSSL_ASN1_TIME_print(void)
{ {
#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && !defined(NO_RSA) \ #if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && !defined(NO_RSA) \
&& (defined(WOLFSSL_MYSQL_COMPATIBLE) || defined(WOLFSSL_NGINX) || \ && (defined(WOLFSSL_MYSQL_COMPATIBLE) || defined(WOLFSSL_NGINX) || \
defined(WOLFSSL_HAPROXY)) && defined(USE_CERT_BUFFERS_2048) defined(WOLFSSL_HAPROXY)) && defined(USE_CERT_BUFFERS_2048) && \
!defined(NO_BIO)
BIO* bio; BIO* bio;
X509* x509; X509* x509;
const unsigned char* der = client_cert_der_2048; const unsigned char* der = client_cert_der_2048;
@@ -30855,7 +30856,8 @@ static void test_wolfSSL_PEM_PrivateKey(void)
} }
#endif #endif
#if !defined(NO_RSA) && (defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN)) #if !defined(NO_BIO) && !defined(NO_RSA) && (defined(WOLFSSL_KEY_GEN) || \
defined(WOLFSSL_CERT_GEN))
{ {
#define BIO_PEM_TEST_CHAR 'a' #define BIO_PEM_TEST_CHAR 'a'
EVP_PKEY* pkey2 = NULL; EVP_PKEY* pkey2 = NULL;
@@ -30927,8 +30929,9 @@ static void test_wolfSSL_PEM_PrivateKey(void)
/* key is DES encrypted */ /* key is DES encrypted */
#if !defined(NO_DES3) && defined(WOLFSSL_ENCRYPTED_KEYS) && \ #if !defined(NO_DES3) && defined(WOLFSSL_ENCRYPTED_KEYS) && \
!defined(NO_RSA) && !defined(NO_FILESYSTEM) && !defined(NO_MD5) && \ !defined(NO_RSA) && !defined(NO_BIO) && !defined(NO_FILESYSTEM) && \
defined(WOLFSSL_KEY_GEN) && !defined(HAVE_USER_RSA) && !defined(NO_RSA) !defined(NO_MD5) && defined(WOLFSSL_KEY_GEN) && \
!defined(HAVE_USER_RSA) && !defined(NO_RSA)
{ {
XFILE f; XFILE f;
wc_pem_password_cb* passwd_cb; wc_pem_password_cb* passwd_cb;
@@ -32663,7 +32666,7 @@ static void test_wolfSSL_X509_STORE_CTX_get0_current_issuer(void)
static void test_wolfSSL_PKCS7_certs(void) static void test_wolfSSL_PKCS7_certs(void)
{ {
#if defined(OPENSSL_ALL) && !defined(NO_CERTS) && \ #if defined(OPENSSL_ALL) && !defined(NO_CERTS) && !defined(NO_BIO) && \
!defined(NO_FILESYSTEM) && !defined(NO_RSA) && defined(HAVE_PKCS7) !defined(NO_FILESYSTEM) && !defined(NO_RSA) && defined(HAVE_PKCS7)
STACK_OF(X509)* sk = NULL; STACK_OF(X509)* sk = NULL;
STACK_OF(X509_INFO)* info_sk = NULL; STACK_OF(X509_INFO)* info_sk = NULL;
@@ -34333,7 +34336,7 @@ static int msgCb(SSL_CTX *ctx, SSL *ssl)
{ {
(void) ctx; (void) ctx;
(void) ssl; (void) ssl;
#if defined(OPENSSL_ALL) && defined(SESSION_CERTS) #if defined(OPENSSL_ALL) && defined(SESSION_CERTS) && !defined(NO_BIO)
STACK_OF(X509)* sk; STACK_OF(X509)* sk;
X509* x509; X509* x509;
int i, num; int i, num;
@@ -34346,7 +34349,7 @@ static int msgCb(SSL_CTX *ctx, SSL *ssl)
AssertNotNull(SSL_get0_verified_chain(ssl)); AssertNotNull(SSL_get0_verified_chain(ssl));
#endif #endif
#if defined(OPENSSL_ALL) && defined(SESSION_CERTS) #if defined(OPENSSL_ALL) && defined(SESSION_CERTS) && !defined(NO_BIO)
bio = BIO_new(BIO_s_file()); bio = BIO_new(BIO_s_file());
BIO_set_fp(bio, stdout, BIO_NOCLOSE); BIO_set_fp(bio, stdout, BIO_NOCLOSE);
sk = SSL_get_peer_cert_chain(ssl); sk = SSL_get_peer_cert_chain(ssl);
@@ -37460,7 +37463,7 @@ static void test_wolfSSL_OBJ(void)
*/ */
#if defined(OPENSSL_EXTRA) && !defined(NO_SHA256) && !defined(NO_ASN) && \ #if defined(OPENSSL_EXTRA) && !defined(NO_SHA256) && !defined(NO_ASN) && \
!defined(HAVE_FIPS) && !defined(NO_SHA) && defined(WOLFSSL_CERT_EXT) && \ !defined(HAVE_FIPS) && !defined(NO_SHA) && defined(WOLFSSL_CERT_EXT) && \
defined(WOLFSSL_CERT_GEN) defined(WOLFSSL_CERT_GEN) && !defined(NO_BIO)
ASN1_OBJECT *obj = NULL; ASN1_OBJECT *obj = NULL;
ASN1_OBJECT *obj2 = NULL; ASN1_OBJECT *obj2 = NULL;
char buf[50]; char buf[50];
@@ -37776,7 +37779,8 @@ static void test_wolfSSL_i2t_ASN1_OBJECT(void)
static void test_wolfSSL_PEM_write_bio_X509(void) static void test_wolfSSL_PEM_write_bio_X509(void)
{ {
#if defined(OPENSSL_EXTRA) && defined(WOLFSSL_AKID_NAME) && \ #if defined(OPENSSL_EXTRA) && defined(WOLFSSL_AKID_NAME) && \
defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_CERT_GEN) defined(WOLFSSL_CERT_EXT) && defined(WOLFSSL_CERT_GEN) && \
!defined(NO_BIO)
/* This test contains the hard coded expected /* This test contains the hard coded expected
* lengths. Update if necessary */ * lengths. Update if necessary */
@@ -46477,7 +46481,7 @@ static void test_X509_REQ(void)
static void test_wolfssl_PKCS7(void) static void test_wolfssl_PKCS7(void)
{ {
#if defined(OPENSSL_ALL) && defined(HAVE_PKCS7) #if defined(OPENSSL_ALL) && defined(HAVE_PKCS7) && !defined(NO_BIO)
PKCS7* pkcs7; PKCS7* pkcs7;
byte data[FOURK_BUF]; byte data[FOURK_BUF];
word32 len = sizeof(data); word32 len = sizeof(data);

2
wolfssl/ssl.h
View File

@@ -1520,6 +1520,7 @@ WOLFSSL_API WOLFSSL_METHOD* wolfSSLv23_client_method(void);
WOLFSSL_API WOLFSSL_METHOD* wolfSSLv2_client_method(void); WOLFSSL_API WOLFSSL_METHOD* wolfSSLv2_client_method(void);
WOLFSSL_API WOLFSSL_METHOD* wolfSSLv2_server_method(void); WOLFSSL_API WOLFSSL_METHOD* wolfSSLv2_server_method(void);
#ifndef NO_BIO
#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
WOLFSSL_API WOLFSSL_BIO* wolfSSL_BIO_new(const WOLFSSL_BIO_METHOD* method); WOLFSSL_API WOLFSSL_BIO* wolfSSL_BIO_new(const WOLFSSL_BIO_METHOD* method);
#else #else
@@ -1636,6 +1637,7 @@ WOLFSSL_API int wolfSSL_BIO_write_filename(WOLFSSL_BIO *bio, char *name);
WOLFSSL_API long wolfSSL_BIO_set_mem_eof_return(WOLFSSL_BIO *bio, int v); WOLFSSL_API long wolfSSL_BIO_set_mem_eof_return(WOLFSSL_BIO *bio, int v);
WOLFSSL_API long wolfSSL_BIO_get_mem_ptr(WOLFSSL_BIO *bio, WOLFSSL_BUF_MEM **m); WOLFSSL_API long wolfSSL_BIO_get_mem_ptr(WOLFSSL_BIO *bio, WOLFSSL_BUF_MEM **m);
WOLFSSL_API int wolfSSL_BIO_get_len(WOLFSSL_BIO *bio); WOLFSSL_API int wolfSSL_BIO_get_len(WOLFSSL_BIO *bio);
#endif
WOLFSSL_API void wolfSSL_RAND_screen(void); WOLFSSL_API void wolfSSL_RAND_screen(void);
WOLFSSL_API const char* wolfSSL_RAND_file_name(char* fname, unsigned long len); WOLFSSL_API const char* wolfSSL_RAND_file_name(char* fname, unsigned long len);