Skip to content

Commit bab432d

Browse files
fix examples to follow options.h config
1 parent 4b8c524 commit bab432d

2 files changed

Lines changed: 63 additions & 76 deletions

File tree

examples/client/client.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
#endif
3333
#include <wolfssl/wolfcrypt/settings.h>
3434

35-
#undef TEST_OPENSSL_COEXIST /* can't use this option with this example */
36-
#undef OPENSSL_COEXIST /* can't use this option with this example */
37-
3835
#include <wolfssl/ssl.h>
3936

4037
#ifdef WOLFSSL_WOLFSENTRY_HOOKS
@@ -3623,7 +3620,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
36233620
) {
36243621
#ifdef NO_FILESYSTEM
36253622
if (wolfSSL_CTX_use_PrivateKey_buffer(ctx, client_key_der_2048,
3626-
sizeof_client_key_der_2048, SSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS)
3623+
sizeof_client_key_der_2048, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS)
36273624
err_sys("can't load client private key buffer");
36283625
#elif !defined(TEST_LOAD_BUFFER)
36293626
if (wolfSSL_CTX_use_PrivateKey_file(ctx, ourKey, fileFormat)
@@ -3663,7 +3660,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
36633660
#endif
36643661
#ifdef NO_FILESYSTEM
36653662
if (wolfSSL_CTX_load_verify_buffer(ctx, ca_cert_der_2048,
3666-
sizeof_ca_cert_der_2048, SSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
3663+
sizeof_ca_cert_der_2048, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
36673664
wolfSSL_CTX_free(ctx); ctx = NULL;
36683665
err_sys("can't load ca buffer, Please run from wolfSSL home dir");
36693666
}
@@ -3687,7 +3684,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
36873684
#ifdef NO_FILESYSTEM
36883685
if (doPeerCheck != 0 &&
36893686
wolfSSL_CTX_load_verify_buffer(ctx, ca_ecc_cert_der_256,
3690-
sizeof_ca_ecc_cert_der_256, SSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
3687+
sizeof_ca_ecc_cert_der_256, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
36913688
wolfSSL_CTX_free(ctx); ctx = NULL;
36923689
err_sys("can't load ecc ca buffer");
36933690
}
@@ -3965,7 +3962,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
39653962
if (useClientCert && loadCertKeyIntoSSLObj){
39663963
#ifdef NO_FILESYSTEM
39673964
if (wolfSSL_use_certificate_buffer(ssl, client_cert_der_2048,
3968-
sizeof_client_cert_der_2048, SSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
3965+
sizeof_client_cert_der_2048, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
39693966
wolfSSL_CTX_free(ctx); ctx = NULL;
39703967
err_sys("can't load client cert buffer");
39713968
}
@@ -3988,7 +3985,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
39883985
) {
39893986
#ifdef NO_FILESYSTEM
39903987
if (wolfSSL_CTX_use_PrivateKey_buffer(ctx, client_key_der_2048,
3991-
sizeof_client_key_der_2048, SSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS)
3988+
sizeof_client_key_der_2048, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS)
39923989
err_sys("can't load client private key buffer");
39933990
#elif !defined(TEST_LOAD_BUFFER)
39943991
if (wolfSSL_use_PrivateKey_file(ssl, ourKey, fileFormat)

0 commit comments

Comments
 (0)