Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -468,3 +468,50 @@ wrapper/Ada/obj/
# Autogenerated debug trace headers
wolfssl/debug-trace-error-codes.h
wolfssl/debug-untrace-error-codes.h
/wrapper/CSharp/SmartDeviceProject1
/commit_squash.sh
/gpg_refresh.sh
/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32.clog
/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32c2.clog
/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32c3.clog
/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32c6.clog
/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32h2.clog
/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32s2.clog
/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp32s3.clog
/IDE/Espressif/ESP-IDF/examples/wolfssl_test/esp8266.clog
/IDE/Espressif/ESP-IDF/examples/wolfssl_test/testAll.sh.wip
/IDE/Espressif/ESP-IDF/examples/wolfssl_test/testMonitor.sh.wip
/server_loop.sh
/UpgradeLog.XML
/wolfcrypt/src/evp.c.wip
/wolfssl/PR_text.md
/wolfssl-VS2022.vcxproj.user
/wolfssl-VS2022a-options_h.vcxproj
/wolfssl-VS2022a.sln
/wolfssl-VS2022a.vcxproj
/wolfssl.sln
/wolfssl.vcproj.not found
/wolfssl_VS2008.sln
/wolfssl_VS2008.vcproj
/wolfssl_VS2008CE.sln
/wolfssl_VS2008CE.vcproj
/wrapper/CSharp/wolfSSL-TLS-Client/wolfSSL-TLS-CE_2008_console.csproj
/wrapper/CSharp/wolfSSL-TLS-Client/wolfSSL-TLS-Client-VS2008.csproj
/wrapper/CSharp/wolfSSL-TLS-Client/wolfSSL-TLS_CE_2008.csproj
/wrapper/CSharp/wolfSSL_CSharp/CSharp_CE_2008.csproj
/wrapper/CSharp/wolfSSL_CSharp/CSharp_CE_2008.sln
/wrapper/CSharp/wolfSSL_CSharp/wolfSSL_CSharp _VS2008.csproj
/wrapper/CSharp/wolfSSL_CSharp-Clients-old.sln
/wrapper/CSharp/wolfSSL_CSharp-Pull Request.sln
/wrapper/CSharp/wolfssl_VS2008.sln
/wrapper/CSharp/wolfssl_VS2008CE.sln
/wrapper/CSharp/wolfssl_VS2012.sln
/_UpgradeReport_Files
/_UpgradeReport_Files/UpgradeReport.css
/_UpgradeReport_Files/UpgradeReport.xslt
/_UpgradeReport_Files/UpgradeReport_Minus.gif
/_UpgradeReport_Files/UpgradeReport_Plus.gif
/DLL Release (options.h)/x64
/wrapper/CSharp/wolfSSL_CSharp-Clients-VS2022.sln
/wrapper/CSharp/wolfSSL_CSharp-VS2022.sln
/wrapper/CSharp/wolfSSL-TLS-Client/wolfSSL-TLS_WCE_2008
4 changes: 3 additions & 1 deletion .wolfssl_known_macro_extras
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@ PLATFORMIO
PLUTON_CRYPTO_ECC
PRINT_SESSION_STATS
PTHREAD_STACK_MIN
PocketPC
QAT_ENABLE_HASH
QAT_ENABLE_RNG
QAT_USE_POLLING_CHECK
Expand Down Expand Up @@ -603,6 +604,7 @@ WC_STRICT_SIG
WC_WANT_FLAG_DONT_USE_AESNI
WC_XMSS_FULL_HASH
WIFI_AVAILABLE
WINCE
WIN_REUSE_CRYPT_HANDLE
WOLFCRYPT_FIPS_CORE_DYNAMIC_HASH_VALUE
WOLFSENTRY_H
Expand Down Expand Up @@ -872,6 +874,7 @@ WOLFSSL_UNALIGNED_64BIT_ACCESS
WOLFSSL_USER_FILESYSTEM
WOLFSSL_USER_LOG
WOLFSSL_USER_MUTEX
WOLFSSL_USER_SETTINGS_TAG
WOLFSSL_USER_THREADING
WOLFSSL_USE_ESP32C3_CRYPT_HASH_HW
WOLFSSL_USE_FLASHMEM
Expand All @@ -897,7 +900,6 @@ WOLF_CRYPTO_CB_ONLY_ECC
WOLF_CRYPTO_CB_ONLY_RSA
WOLF_CRYPTO_DEV
WOLF_NO_TRAILING_ENUM_COMMAS
WindowsCE
XGETPASSWD
XMSS_CALL_PRF_KEYGEN
XPAR_VERSAL_CIPS_0_PSPMC_0_PSV_CORTEXA72_0_TIMESTAMP_CLK_FREQ
Expand Down
2 changes: 2 additions & 0 deletions IDE/WIN/user_settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#error This user_settings.h header is only designed for Windows
#endif

#define WOLFSSL_USER_SETTINGS_TAG "wolfssl v5.8.0 for IDE/WIN example config"

#define USE_WOLFSSL_IO
#define HAVE_AESGCM
#define WOLFSSL_TLS13
Expand Down
7 changes: 6 additions & 1 deletion src/bio.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@

#if !defined(WOLFSSL_BIO_INCLUDED)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning bio.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"bio.c does not need to be compiled separately from ssl.c")
#else
#warning bio.c does not need to be compiled separately from ssl.c
#endif
#endif
#else

Expand Down
7 changes: 6 additions & 1 deletion src/conf.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@

#if !defined(WOLFSSL_CONF_INCLUDED)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning conf.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"conf.c does not need to be compiled separately from ssl.c")
#else
#warning conf.c does not need to be compiled separately from ssl.c
#endif
#endif
#else

Expand Down
7 changes: 6 additions & 1 deletion src/pk.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@

#if !defined(WOLFSSL_PK_INCLUDED)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning pk.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"pk.c does not need to be compiled separately from ssl.c")
#else
#warning pk.c does not need to be compiled separately from ssl.c
#endif
#endif
#else

Expand Down
14 changes: 14 additions & 0 deletions src/ssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -15375,6 +15375,20 @@ const char* wolfSSL_lib_version(void)
return LIBWOLFSSL_VERSION_STRING;
}

/* current user_settings.h breadcrumb tag */
const char* wolfSSL_user_settings_tag(void)
{
#ifdef WOLFSSL_USER_SETTINGS
#ifdef WOLFSSL_USER_SETTINGS_TAG
return WOLFSSL_USER_SETTINGS_TAG;
#else
return "unknown or WOLFSSL_USER_SETTINGS_TAG not set";
#endif
#else
return "WOLFSSL_USER_SETTINGS not defined, assuming options.h build";
#endif
}

#ifdef OPENSSL_EXTRA
#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
const char* wolfSSL_OpenSSL_version(int a)
Expand Down
8 changes: 7 additions & 1 deletion src/ssl_asn1.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@

#if !defined(WOLFSSL_SSL_ASN1_INCLUDED)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning ssl_asn1.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"ssl_asn1.c does not need to be compiled separately from ssl.c")
#else
#warning \
ssl_asn1.c does not need to be compiled separately from ssl.c
#endif
#endif
#else

Expand Down
7 changes: 6 additions & 1 deletion src/ssl_bn.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@

#if !defined(WOLFSSL_SSL_BN_INCLUDED)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning ssl_bn.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"ssl_bn.c does not need to be compiled separately from ssl.c")
#else \
#warning ssl_bn.c does not need to be compiled separately from ssl.c
#endif
#endif
#else

Expand Down
8 changes: 7 additions & 1 deletion src/ssl_certman.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@

#if !defined(WOLFSSL_SSL_CERTMAN_INCLUDED)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning ssl_certman.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"ssl_certman.c does not need to be compiled separately from ssl.c")
#else
#warning \
ssl_certman.c does not need to be compiled separately from ssl.c
#endif
#endif
#else

Expand Down
8 changes: 7 additions & 1 deletion src/ssl_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@

#ifndef WOLFSSL_SSL_CRYPTO_INCLUDED
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning ssl_crypto.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"ssl_crypto.c does not need to be compiled separately from ssl.c")
#else
#warning \
ssl_crypto.c does not need to be compiled separately from ssl.c
#endif
#endif
#else

Expand Down
8 changes: 7 additions & 1 deletion src/ssl_load.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,13 @@

#if !defined(WOLFSSL_SSL_LOAD_INCLUDED)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning ssl_load.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"ssl_load.c does not need to be compiled separately from ssl.c")
#else
#warning \
ssl_load.c does not need to be compiled separately from ssl.c
#endif
#endif
#else

Expand Down
8 changes: 7 additions & 1 deletion src/ssl_misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@

#if !defined(WOLFSSL_SSL_MISC_INCLUDED)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning ssl_misc.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"ssl_misc.c does not need to be compiled separately from ssl.c")
#else
#warning \
ssl_misc.c does not need to be compiled separately from ssl.c
#endif
#endif
#else

Expand Down
8 changes: 7 additions & 1 deletion src/ssl_p7p12.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,13 @@

#if !defined(WOLFSSL_SSL_P7P12_INCLUDED)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning ssl_p7p12.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"ssl_p7p12.c does not need to be compiled separately from ssl.c")
#else
#warning \
ssl_p7p12.c does not need to be compiled separately from ssl.c
#endif
#endif
#else

Expand Down
8 changes: 7 additions & 1 deletion src/ssl_sess.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@

#if !defined(WOLFSSL_SSL_SESS_INCLUDED)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning ssl_sess.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"ssl_sess.c does not need to be compiled separately from ssl.c")
#else
#warning \
ssl_sess.c does not need to be compiled separately from ssl.c
#endif
#endif
#else

Expand Down
10 changes: 5 additions & 5 deletions src/wolfio.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ int SslBioSend(WOLFSSL* ssl, char *buf, int sz, void *ctx)
/* The receive embedded callback
* return : nb bytes read, or error
*/
int EmbedReceive(WOLFSSL *ssl, char *buf, int sz, void *ctx)
int WOLFSSL_CALL EmbedReceive(WOLFSSL *ssl, char *buf, int sz, void *ctx)
{
int recvd;
#ifndef WOLFSSL_LINUXKM
Expand All @@ -424,7 +424,7 @@ int EmbedReceive(WOLFSSL *ssl, char *buf, int sz, void *ctx)
/* The send embedded callback
* return : nb bytes sent, or error
*/
int EmbedSend(WOLFSSL* ssl, char *buf, int sz, void *ctx)
int WOLFSSL_CALL EmbedSend(WOLFSSL* ssl, char *buf, int sz, void *ctx)
{
int sent;
#ifndef WOLFSSL_LINUXKM
Expand Down Expand Up @@ -637,7 +637,7 @@ static int isDGramSock(int sfd)
/* The receive embedded callback
* return : nb bytes read, or error
*/
int EmbedReceiveFrom(WOLFSSL *ssl, char *buf, int sz, void *ctx)
int WOLFSSL_CALL EmbedReceiveFrom(WOLFSSL *ssl, char *buf, int sz, void *ctx)
{
WOLFSSL_DTLS_CTX* dtlsCtx = (WOLFSSL_DTLS_CTX*)ctx;
int recvd;
Expand Down Expand Up @@ -886,7 +886,7 @@ int EmbedReceiveFrom(WOLFSSL *ssl, char *buf, int sz, void *ctx)
/* The send embedded callback
* return : nb bytes sent, or error
*/
int EmbedSendTo(WOLFSSL* ssl, char *buf, int sz, void *ctx)
int WOLFSSL_CALL EmbedSendTo(WOLFSSL* ssl, char *buf, int sz, void *ctx)
{
WOLFSSL_DTLS_CTX* dtlsCtx = (WOLFSSL_DTLS_CTX*)ctx;
int sd = dtlsCtx->wfd;
Expand Down Expand Up @@ -956,7 +956,7 @@ int EmbedReceiveFromMcast(WOLFSSL *ssl, char *buf, int sz, void *ctx)
/* The DTLS Generate Cookie callback
* return : number of bytes copied into buf, or error
*/
int EmbedGenerateCookie(WOLFSSL* ssl, byte *buf, int sz, void *ctx)
int WOLFSSL_CALL EmbedGenerateCookie(WOLFSSL* ssl, byte *buf, int sz, void *ctx)
{
int sd = ssl->wfd;
SOCKADDR_S peer;
Expand Down
7 changes: 6 additions & 1 deletion src/x509.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@

#if !defined(WOLFSSL_X509_INCLUDED)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning x509.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"x509.c does not need to be compiled separately from ssl.c")
#else
#warning x509.c does not need to be compiled separately from ssl.c
#endif
#endif
#else

Expand Down
9 changes: 8 additions & 1 deletion src/x509_str.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@

#if !defined(WOLFSSL_X509_STORE_INCLUDED)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning x509_str.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"x509_str.c does not need to be compiled separately from ssl.c")
#else
#warning \
x509_str.c does not need to be compiled separately from ssl.c
#endif

#endif
#else

Expand Down
7 changes: 6 additions & 1 deletion wolfcrypt/src/evp.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@

#if !defined(WOLFSSL_EVP_INCLUDED)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning evp.c does not need to be compiled separately from ssl.c
#if defined(_MSC_VER)
#pragma message( \
"evp.c does not need to be compiled separately from ssl.c")
#else \
#warning evp.c does not need to be compiled separately from ssl.c
#endif
#endif
#elif defined(WOLFCRYPT_ONLY)
#else
Expand Down
9 changes: 9 additions & 0 deletions wolfcrypt/src/logging.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@

#include <wolfssl/wolfcrypt/libwolfssl_sources.h>

#ifdef WOLFSSL_DLL
/* Breadcrumb Tag can be helpful when debugging Binary DLL compatibility */
WOLFSSL_API const char* wolfSSL_dll_tag(void);
const char* wolfSSL_dll_tag(void)
{
return WOLFSSL_DLL_TAG;
}
#endif

#if defined(OPENSSL_EXTRA) && !defined(WOLFCRYPT_ONLY)
/* avoid adding WANT_READ and WANT_WRITE to error queue */
#include <wolfssl/error-ssl.h>
Expand Down
8 changes: 7 additions & 1 deletion wolfcrypt/src/misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ masking and clearing memory logic.
/* Check for if compiling misc.c when not needed. */
#if !defined(WOLFSSL_MISC_INCLUDED) && !defined(NO_INLINE)
#ifndef WOLFSSL_IGNORE_FILE_WARN
#warning misc.c does not need to be compiled when using inline (NO_INLINE not defined)
#if defined(_MSC_VER)
#pragma message( \
"misc.c does not need to be compiled when using inline (NO_INLINE not defined)")
#else
#warning \
misc.c does not need to be compiled when using inline (NO_INLINE not defined)
#endif
#endif

#else
Expand Down
Loading
Loading