Skip to content

Commit ed90c17

Browse files
committed
CSharp Wrapper Improvements
1 parent 6512635 commit ed90c17

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1636
-231
lines changed

.wolfssl_known_macro_extras

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,7 @@ PLATFORMIO
440440
PLUTON_CRYPTO_ECC
441441
PRINT_SESSION_STATS
442442
PTHREAD_STACK_MIN
443+
PocketPC
443444
QAT_ENABLE_HASH
444445
QAT_ENABLE_RNG
445446
QAT_USE_POLLING_CHECK
@@ -603,6 +604,7 @@ WC_STRICT_SIG
603604
WC_WANT_FLAG_DONT_USE_AESNI
604605
WC_XMSS_FULL_HASH
605606
WIFI_AVAILABLE
607+
WINCE
606608
WIN_REUSE_CRYPT_HANDLE
607609
WOLFCRYPT_FIPS_CORE_DYNAMIC_HASH_VALUE
608610
WOLFSENTRY_H
@@ -872,6 +874,7 @@ WOLFSSL_UNALIGNED_64BIT_ACCESS
872874
WOLFSSL_USER_FILESYSTEM
873875
WOLFSSL_USER_LOG
874876
WOLFSSL_USER_MUTEX
877+
WOLFSSL_USER_SETTINGS_TAG
875878
WOLFSSL_USER_THREADING
876879
WOLFSSL_USE_ESP32C3_CRYPT_HASH_HW
877880
WOLFSSL_USE_FLASHMEM
@@ -897,7 +900,6 @@ WOLF_CRYPTO_CB_ONLY_ECC
897900
WOLF_CRYPTO_CB_ONLY_RSA
898901
WOLF_CRYPTO_DEV
899902
WOLF_NO_TRAILING_ENUM_COMMAS
900-
WindowsCE
901903
XGETPASSWD
902904
XMSS_CALL_PRF_KEYGEN
903905
XPAR_VERSAL_CIPS_0_PSPMC_0_PSV_CORTEXA72_0_TIMESTAMP_CLK_FREQ

IDE/WIN/user_settings.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
#error This user_settings.h header is only designed for Windows
77
#endif
88

9+
#define WOLFSSL_USER_SETTINGS_TAG "wolfssl v5.8.0 for IDE/WIN example config"
10+
911
#define USE_WOLFSSL_IO
1012
#define HAVE_AESGCM
1113
#define WOLFSSL_TLS13

src/bio.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@
2828

2929
#if !defined(WOLFSSL_BIO_INCLUDED)
3030
#ifndef WOLFSSL_IGNORE_FILE_WARN
31-
#warning bio.c does not need to be compiled separately from ssl.c
31+
#if defined(_MSC_VER)
32+
#pragma message( \
33+
"bio.c does not need to be compiled separately from ssl.c")
34+
#else
35+
#warning bio.c does not need to be compiled separately from ssl.c
36+
#endif
3237
#endif
3338
#else
3439

src/conf.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@
2323

2424
#if !defined(WOLFSSL_CONF_INCLUDED)
2525
#ifndef WOLFSSL_IGNORE_FILE_WARN
26-
#warning conf.c does not need to be compiled separately from ssl.c
26+
#if defined(_MSC_VER)
27+
#pragma message( \
28+
"conf.c does not need to be compiled separately from ssl.c")
29+
#else
30+
#warning conf.c does not need to be compiled separately from ssl.c
31+
#endif
2732
#endif
2833
#else
2934

src/pk.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@
4343

4444
#if !defined(WOLFSSL_PK_INCLUDED)
4545
#ifndef WOLFSSL_IGNORE_FILE_WARN
46-
#warning pk.c does not need to be compiled separately from ssl.c
46+
#if defined(_MSC_VER)
47+
#pragma message( \
48+
"pk.c does not need to be compiled separately from ssl.c")
49+
#else
50+
#warning pk.c does not need to be compiled separately from ssl.c
51+
#endif
4752
#endif
4853
#else
4954

src/ssl.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15375,6 +15375,20 @@ const char* wolfSSL_lib_version(void)
1537515375
return LIBWOLFSSL_VERSION_STRING;
1537615376
}
1537715377

15378+
/* current user_settings.h breadcrumb tag */
15379+
const char* wolfSSL_user_settings_tag(void)
15380+
{
15381+
#ifdef WOLFSSL_USER_SETTINGS
15382+
#ifdef WOLFSSL_USER_SETTINGS_TAG
15383+
return WOLFSSL_USER_SETTINGS_TAG;
15384+
#else
15385+
return "unknown or WOLFSSL_USER_SETTINGS_TAG not set"
15386+
#endif
15387+
#else
15388+
return "WOLFSSL_USER_SETTINGS not defined, assuming options.h build"
15389+
#endif
15390+
}
15391+
1537815392
#ifdef OPENSSL_EXTRA
1537915393
#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
1538015394
const char* wolfSSL_OpenSSL_version(int a)

src/ssl_asn1.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@
2828

2929
#if !defined(WOLFSSL_SSL_ASN1_INCLUDED)
3030
#ifndef WOLFSSL_IGNORE_FILE_WARN
31-
#warning ssl_asn1.c does not need to be compiled separately from ssl.c
31+
#if defined(_MSC_VER)
32+
#pragma message( \
33+
"ssl_asn1.c does not need to be compiled separately from ssl.c")
34+
#else
35+
#warning \
36+
ssl_asn1.c does not need to be compiled separately from ssl.c
37+
#endif
3238
#endif
3339
#else
3440

src/ssl_bn.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@
2828

2929
#if !defined(WOLFSSL_SSL_BN_INCLUDED)
3030
#ifndef WOLFSSL_IGNORE_FILE_WARN
31-
#warning ssl_bn.c does not need to be compiled separately from ssl.c
31+
#if defined(_MSC_VER)
32+
#pragma message( \
33+
"ssl_bn.c does not need to be compiled separately from ssl.c")
34+
#else \
35+
#warning ssl_bn.c does not need to be compiled separately from ssl.c
36+
#endif
3237
#endif
3338
#else
3439

src/ssl_certman.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@
2525

2626
#if !defined(WOLFSSL_SSL_CERTMAN_INCLUDED)
2727
#ifndef WOLFSSL_IGNORE_FILE_WARN
28-
#warning ssl_certman.c does not need to be compiled separately from ssl.c
28+
#if defined(_MSC_VER)
29+
#pragma message( \
30+
"ssl_certman.c does not need to be compiled separately from ssl.c")
31+
#else
32+
#warning \
33+
ssl_certman.c does not need to be compiled separately from ssl.c
34+
#endif
2935
#endif
3036
#else
3137

src/ssl_crypto.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@
2323

2424
#ifndef WOLFSSL_SSL_CRYPTO_INCLUDED
2525
#ifndef WOLFSSL_IGNORE_FILE_WARN
26-
#warning ssl_crypto.c does not need to be compiled separately from ssl.c
26+
#if defined(_MSC_VER)
27+
#pragma message( \
28+
"ssl_crypto.c does not need to be compiled separately from ssl.c")
29+
#else
30+
#warning \
31+
ssl_crypto.c does not need to be compiled separately from ssl.c
32+
#endif
2733
#endif
2834
#else
2935

0 commit comments

Comments
 (0)