mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-07-30 02:37:28 +02:00
Fix build errors with NO_BIO config
This commit is contained in:
Eric Blankenhorn
@ -5986,12 +5986,12 @@ int SetSSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx, int writeDup)
|
||||
#ifdef OPENSSL_EXTRA
|
||||
ssl->readAhead = ctx->readAhead;
|
||||
#endif
|
||||
#ifdef OPENSSL_EXTRA
|
||||
#if defined(OPENSSL_EXTRA) && !defined(NO_BIO)
|
||||
/* Don't change recv callback if currently using BIO's */
|
||||
if (ssl->CBIORecv != BioReceive)
|
||||
#endif
|
||||
ssl->CBIORecv = ctx->CBIORecv;
|
||||
#ifdef OPENSSL_EXTRA
|
||||
#if defined(OPENSSL_EXTRA) && !defined(NO_BIO)
|
||||
/* Don't change send callback if currently using BIO's */
|
||||
if (ssl->CBIOSend != BioSend)
|
||||
#endif
|
||||
|
||||
38
src/ssl.c
38
src/ssl.c
@ -26223,6 +26223,7 @@ WOLFSSL_X509_CRL *wolfSSL_d2i_X509_CRL_fp(XFILE fp, WOLFSSL_X509_CRL **crl)
|
||||
return (WOLFSSL_X509_CRL *)wolfSSL_d2i_X509_fp_ex(fp, (void **)crl, CRL_TYPE);
|
||||
}
|
||||
|
||||
#ifndef NO_BIO
|
||||
/* Read CRL file, and add it to store and corresponding cert manager */
|
||||
/* @param ctx a pointer of X509_LOOKUP back to the X509_STORE */
|
||||
/* @param file a file to read */
|
||||
@ -26297,6 +26298,7 @@ WOLFSSL_API int wolfSSL_X509_load_crl_file(WOLFSSL_X509_LOOKUP *ctx,
|
||||
WOLFSSL_LEAVE("wolfSSL_X509_load_crl_file", ret);
|
||||
return ret;
|
||||
}
|
||||
#endif /* !NO_BIO */
|
||||
#endif /* !NO_FILESYSTEM */
|
||||
|
||||
|
||||
@ -29901,9 +29903,8 @@ int wolfSSL_AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
|
||||
#endif /* HAVE_AES_KEYWRAP && !HAVE_FIPS && !HAVE_SELFTEST */
|
||||
#endif /* NO_AES */
|
||||
|
||||
#ifndef NO_BIO
|
||||
|
||||
#ifndef NO_ASN_TIME
|
||||
#ifndef NO_BIO
|
||||
int wolfSSL_ASN1_UTCTIME_print(WOLFSSL_BIO* bio, const WOLFSSL_ASN1_UTCTIME* a)
|
||||
{
|
||||
WOLFSSL_ENTER("ASN1_UTCTIME_print");
|
||||
@ -35460,7 +35461,7 @@ int wolfSSL_PEM_write_bio_RSAPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_RSA* key,
|
||||
XMEMCPY(pkey->pkey.ptr, derBuf, derSz);
|
||||
XFREE(derBuf, bio->heap, DYNAMIC_TYPE_TMP_BUFFER);
|
||||
}
|
||||
#endif
|
||||
#endif /* WOLFSSL_KEY_GEN && !NO_RSA && !HAVE_USER_RSA */
|
||||
|
||||
ret = wolfSSL_PEM_write_bio_PrivateKey(bio, pkey, cipher, passwd, len,
|
||||
cb, arg);
|
||||
@ -35505,7 +35506,7 @@ int wolfSSL_PEM_write_bio_RSA_PUBKEY(WOLFSSL_BIO* bio, WOLFSSL_RSA* rsa)
|
||||
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
#endif /* WOLFSSL_KEY_GEN && !NO_RSA && !HAVE_USER_RSA */
|
||||
|
||||
|
||||
/* Reads an RSA public key from a WOLFSSL_BIO into a WOLFSSL_RSA
|
||||
@ -35561,7 +35562,7 @@ static int WriteBioPUBKEY(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key)
|
||||
break;
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
#endif /* WOLFSSL_KEY_GEN && !NO_RSA && !HAVE_USER_RSA */
|
||||
#if !defined(NO_DSA) && !defined(HAVE_SELFTEST) && (defined(WOLFSSL_KEY_GEN) || \
|
||||
defined(WOLFSSL_CERT_GEN))
|
||||
case EVP_PKEY_DSA:
|
||||
@ -35583,7 +35584,7 @@ static int WriteBioPUBKEY(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key)
|
||||
break;
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
#endif /* !NO_DSA && !HAVE_SELFTEST && (WOLFSSL_KEY_GEN || WOLFSSL_CERT_GEN) */
|
||||
#if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT)
|
||||
case EVP_PKEY_EC:
|
||||
{
|
||||
@ -35609,12 +35610,12 @@ static int WriteBioPUBKEY(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key)
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
#endif /* HAVE_ECC && HAVE_ECC_KEY_EXPORT */
|
||||
#if !defined(NO_DH) && (defined(WOLFSSL_QT) || defined(OPENSSL_ALL))
|
||||
case EVP_PKEY_DH:
|
||||
WOLFSSL_MSG("Writing DH PUBKEY not supported!");
|
||||
break;
|
||||
#endif
|
||||
#endif /* !NO_DH && (WOLFSSL_QT || OPENSSL_ALL) */
|
||||
default:
|
||||
WOLFSSL_MSG("Unknown Key type!");
|
||||
break;
|
||||
@ -39324,7 +39325,7 @@ static int pem_read_bio_key(WOLFSSL_BIO* bio, pem_password_cb* cb, void* pass,
|
||||
ret = MEMORY_E;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif /* WOLFSSL_SMALL_STACK */
|
||||
|
||||
if (ret >= 0) {
|
||||
XMEMSET(info, 0, sizeof(EncryptedInfo));
|
||||
@ -39554,7 +39555,8 @@ WOLFSSL_DSA *wolfSSL_PEM_read_bio_DSA_PUBKEY(WOLFSSL_BIO* bio,WOLFSSL_DSA** dsa,
|
||||
wolfSSL_EVP_PKEY_free(pkey);
|
||||
return local;
|
||||
}
|
||||
#endif
|
||||
#endif /* (OPENSSL_EXTRA || OPENSSL_ALL) && (!NO_CERTS &&
|
||||
!NO_FILESYSTEM && !NO_DSA && WOLFSSL_KEY_GEN) */
|
||||
|
||||
#ifdef HAVE_ECC
|
||||
/* returns a new WOLFSSL_EC_GROUP structure on success and NULL on fail */
|
||||
@ -46055,7 +46057,7 @@ WOLFSSL_RSA* wolfSSL_d2i_RSAPrivateKey_bio(WOLFSSL_BIO *bio, WOLFSSL_RSA **out)
|
||||
XFREE((unsigned char*)maxKeyBuf, bio->heap, DYNAMIC_TYPE_TMP_BUFFER);
|
||||
return key;
|
||||
}
|
||||
#endif
|
||||
#endif /* !HAVE_FAST_RSA && WOLFSSL_KEY_GEN && !NO_RSA && !HAVE_USER_RSA */
|
||||
|
||||
#endif /* !NO_BIO */
|
||||
|
||||
@ -50264,7 +50266,7 @@ int wolfSSL_set_alpn_protos(WOLFSSL* ssl,
|
||||
}
|
||||
#endif /* !NO_BIO */
|
||||
#endif /* HAVE_ALPN */
|
||||
#endif
|
||||
#endif /* OPENSSL_EXTRA */
|
||||
|
||||
#if defined(OPENSSL_EXTRA)
|
||||
|
||||
@ -55576,7 +55578,7 @@ void wolfSSL_BUF_MEM_free(WOLFSSL_BUF_MEM* buf)
|
||||
* START OF TXT_DB API
|
||||
******************************************************************************/
|
||||
|
||||
#if defined(OPENSSL_ALL)
|
||||
#if defined(OPENSSL_ALL) && !defined(NO_BIO)
|
||||
/**
|
||||
* This function reads a tab delimetered CSV input and returns
|
||||
* a populated WOLFSSL_TXT_DB structure.
|
||||
@ -55838,7 +55840,7 @@ WOLFSSL_STRING *wolfSSL_TXT_DB_get_by_index(WOLFSSL_TXT_DB *db, int idx,
|
||||
return (WOLFSSL_STRING*) wolfSSL_lh_retrieve(db->data, value);
|
||||
}
|
||||
|
||||
#endif /* OPENSSL_ALL */
|
||||
#endif /* OPENSSL_ALL && !NO_BIO */
|
||||
|
||||
/*******************************************************************************
|
||||
* END OF TXT_DB API
|
||||
@ -58047,7 +58049,7 @@ void *wolfSSL_BIO_get_ex_data(WOLFSSL_BIO *bio, int idx)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef OPENSSL_EXTRA
|
||||
#if defined(OPENSSL_EXTRA) && !defined(NO_BIO)
|
||||
/* returns amount printed on success, negative in fail case */
|
||||
int wolfSSL_BIO_vprintf(WOLFSSL_BIO* bio, const char* format, va_list args)
|
||||
{
|
||||
@ -58071,7 +58073,7 @@ int wolfSSL_BIO_vprintf(WOLFSSL_BIO* bio, const char* format, va_list args)
|
||||
/* In Visual Studio versions prior to Visual Studio 2013, the va_* symbols
|
||||
aren't defined. If using Visual Studio 2013 or later, define
|
||||
HAVE_VA_COPY. */
|
||||
#if defined(OPENSSL_EXTRA) && (!defined(_WIN32) || defined(HAVE_VA_COPY))
|
||||
#if !defined(_WIN32) || defined(HAVE_VA_COPY)
|
||||
case WOLFSSL_BIO_SSL:
|
||||
{
|
||||
int count;
|
||||
@ -58102,7 +58104,7 @@ int wolfSSL_BIO_vprintf(WOLFSSL_BIO* bio, const char* format, va_list args)
|
||||
va_end(copy);
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
#endif /* !_WIN32 || HAVE_VA_COPY */
|
||||
|
||||
default:
|
||||
WOLFSSL_MSG("Unsupported WOLFSSL_BIO type for wolfSSL_BIO_printf");
|
||||
@ -58125,7 +58127,7 @@ int wolfSSL_BIO_printf(WOLFSSL_BIO* bio, const char* format, ...)
|
||||
|
||||
return ret;
|
||||
}
|
||||
#endif /* OPENSSL_EXTRA */
|
||||
#endif /* OPENSSL_EXTRA && !NO_BIO */
|
||||
|
||||
#if !defined(NO_FILESYSTEM) && defined(__clang__)
|
||||
#pragma clang diagnostic pop
|
||||
|
||||
@ -7805,7 +7805,7 @@ void wolfSSL_EVP_PKEY_free(WOLFSSL_EVP_PKEY* key)
|
||||
}
|
||||
}
|
||||
}
|
||||
#if defined(OPENSSL_EXTRA)
|
||||
#if defined(OPENSSL_EXTRA) && !defined(NO_BIO)
|
||||
|
||||
/* Indent writes white spaces of the number specified by "indents"
|
||||
* to the BIO. The number of white spaces is limited from 0 to
|
||||
@ -8685,7 +8685,7 @@ int wolfSSL_EVP_PKEY_print_public(WOLFSSL_BIO* out,
|
||||
}
|
||||
return res;
|
||||
}
|
||||
#endif /* OPENSSL_EXTRA */
|
||||
#endif /* OPENSSL_EXTRA && !NO_BIO */
|
||||
|
||||
int wolfSSL_EVP_get_hashinfo(const WOLFSSL_EVP_MD* evp,
|
||||
int* pHash, int* pHashSz)
|
||||
|
||||
Reference in New Issue
Block a user