Skip to content

Improve TLS crypto callback examples #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SparkiDev merged 9 commits into from
Jan 11, 2024
Merged

Improve TLS crypto callback examples #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
90f5882
Fix typo with HMAC determination of update/final.
dgarske Dec 14, 2023
124998f
Add example for TLS server with crypto callbacks.
dgarske Dec 18, 2023
1e5f87b
Better example for crypto callback hashing.
dgarske Dec 18, 2023
005e08d
For crypto cb TLS examples do free if not a copy.
dgarske Dec 19, 2023
ed2549c
Support building TLS examples with `--disable-oldnames`.
dgarske Dec 19, 2023
d505779
Improved TLS cryptocb test cases.
dgarske Dec 19, 2023
1c6e1c4
Add mutual auth, RSA/ECC and TLS v1.2/v1.3 support to TLS crypto call…
dgarske Dec 19, 2023
f808600
Peer review feedback.
dgarske Jan 10, 2024
ab0d633
Peer review cleanups 2.
dgarske Jan 11, 2024
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,15 @@ android/wolfssljni-ndk-sample/proguard-project.txt
/psk/server-psk
/psk/server-tcp

/tls/client-async
/tls/client-tcp
/tls/client-tls
/tls/client-tls13
/tls/client-tls13-resume
/tls/client-tls-bio
/tls/client-tls-cacb
/tls/client-tls-callback
/tls/client-tls-cryptocb
/tls/client-tls-ecdhe
/tls/client-tls-nonblocking
/tls/client-tls-perf
Expand All @@ -89,10 +91,12 @@ android/wolfssljni-ndk-sample/proguard-project.txt

/tls/memory-tls

/tls/server-async
/tls/server-tcp
/tls/server-tls
/tls/server-tls13
/tls/server-tls-callback
/tls/server-tls-cryptocb
/tls/server-tls-ecdhe
/tls/server-tls-epoll-perf
/tls/server-tls-epoll-threaded
Expand Down
12 changes: 10 additions & 2 deletions tls/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ STATIC_LIB = $(LIB_PATH)/lib/libwolfssl.a
DEBUG_FLAGS = -g -DDEBUG
DEBUG_INC_PATHS = -MD
OPTIMIZE = -Os
DEPS =

# Options
#CFLAGS+=$(DEBUG_FLAGS)
Expand All @@ -19,9 +20,14 @@ CFLAGS+=$(OPTIMIZE)
#LIBS+=$(STATIC_LIB)
LIBS+=$(DYN_LIB)

# Openssl Option
#CFLAGS+=-DUSE_OPENSSL
#LIBS+=-lcrypto

# build targets
SRC=$(wildcard *.c)
TARGETS=$(patsubst %.c, %, $(SRC))
IGNORE_FILES=cryptocb-common
TARGETS=$(filter-out $(IGNORE_FILES), $(patsubst %.c, %, $(SRC)))
LINUX_SPECIFIC=client-tls-perf \
server-tls-poll-perf \
server-tls-epoll-perf \
Expand Down Expand Up @@ -97,9 +103,11 @@ memory-tls: CFLAGS+=-pthread
# compile tcp examples without the LIBS variable
%-tcp: LIBS=

%-cryptocb: DEPS+=cryptocb-common.c

# build template
%: %.c
$(CC) -o $@ $< $(CFLAGS) $(LIBS)
$(CC) -o $@ $(DEPS) $< $(CFLAGS) $(LIBS)

clean:
rm -f $(TARGETS)
12 changes: 6 additions & 6 deletions tls/client-tls-cacb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ static void CaCb(unsigned char* der, int sz, int type)
}

ret = wolfSSL_X509_get_serial_number(x509, serial, &sz);
if (ret == SSL_SUCCESS) {
if (ret == WOLFSSL_SUCCESS) {
int i;
int strLen;
char serialMsg[80];
Expand Down Expand Up @@ -134,28 +134,28 @@ int Security(int sock)
/* create and initialize WOLFSSL_CTX structure */
if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())) == NULL) {
printf("SSL_CTX_new error.\n");
ret = EXIT_FAILURE;
ret = EXIT_FAILURE;
goto exit;
}

/* set callback for action when CA's are added */
wolfSSL_CTX_SetCACb(ctx, CaCb);

/* load CA certificates into wolfSSL_CTX. which will verify the server */
if ((ret = wolfSSL_CTX_load_verify_locations(ctx, cert, 0))
if ((ret = wolfSSL_CTX_load_verify_locations(ctx, cert, 0))
!= WOLFSSL_SUCCESS) {
printf("Error loading %s. Please check the file.\n", cert);
goto exit;
}
if ((ssl = wolfSSL_new(ctx)) == NULL) {
printf("wolfSSL_new error.\n");
ret = EXIT_FAILURE;
ret = EXIT_FAILURE;
goto exit;
}
wolfSSL_set_fd(ssl, sock);

ret = wolfSSL_connect(ssl);
if (ret == SSL_SUCCESS) {
if (ret == WOLFSSL_SUCCESS) {
ret = ClientGreet(sock, ssl);
}

Expand Down Expand Up @@ -190,7 +190,7 @@ int main(int argc, char** argv)

if (sockfd < 0) {
printf("Failed to create socket. Error: %i\n", errno);
ret = EXIT_FAILURE;
ret = EXIT_FAILURE;
goto exit;
}

Expand Down
Loading