WolfSSL
/
wolfssl-examples
mirror of https://github.com/wolfSSL/wolfssl-examples.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Cleanups for DTLS 1.3 client/server examples.

pull/453/head
David Garske 2024-08-28 08:17:48 -07:00
parent f707ad83da
commit eaa8e8e022
4 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -53,12 +53,15 @@ android/wolfssljni-ndk-sample/proguard-project.txt
/dtls/client-dtls-resume /dtls/client-dtls-resume
/dtls/client-dtls-shared /dtls/client-dtls-shared
/dtls/client-dtls /dtls/client-dtls
/dtls/client-dtls13
/dtls/client-udp /dtls/client-udp
/dtls/server-dtls-callback /dtls/server-dtls-callback
/dtls/server-dtls-ipv6 /dtls/server-dtls-ipv6
/dtls/server-dtls-nonblocking /dtls/server-dtls-nonblocking
/dtls/server-dtls-threaded /dtls/server-dtls-threaded
/dtls/server-dtls /dtls/server-dtls
/dtls/server-dtls13
/dtls/server-dtls13-event
/dtls/server-udp /dtls/server-udp
/psk/client-psk-bio-custom /psk/client-psk-bio-custom

27
dtls/client-dtls13.c
View File

@ -1,7 +1,7 @@
/* /*
* client-dtls13.c * client-dtls13.c
* *
* Copyright (C) 2006-2022 wolfSSL Inc. * Copyright (C) 2006-2024 wolfSSL Inc.
* *
* This file is part of wolfSSL. (formerly known as CyaSSL) * This file is part of wolfSSL. (formerly known as CyaSSL)
* *
@ -29,7 +29,9 @@
* Define USE_DTLS12 to use DTLS 1.2 instead of DTLS 1.3 * Define USE_DTLS12 to use DTLS 1.2 instead of DTLS 1.3
*/ */
#ifndef WOLFSSL_USER_SETTINGS
#include <wolfssl/options.h> #include <wolfssl/options.h>
#endif
#include <unistd.h> #include <unistd.h>
#include <wolfssl/ssl.h> #include <wolfssl/ssl.h>
#include <netdb.h> #include <netdb.h>
@ -45,7 +47,7 @@
int main (int argc, char** argv) int main (int argc, char** argv)
{ {
/* standard variables used in a dtls client*/ /* standard variables used in a dtls client */
int n = 0; int n = 0;
int sockfd = INVALID_SOCKET; int sockfd = INVALID_SOCKET;
int err; int err;
@ -65,14 +67,14 @@ int main (int argc, char** argv)
/* Initialize wolfSSL before assigning ctx */ /* Initialize wolfSSL before assigning ctx */
if (wolfSSL_Init() != WOLFSSL_SUCCESS) { if (wolfSSL_Init() != WOLFSSL_SUCCESS) {
fprintf(stderr, "wolfSSL_CTX_new error.\n"); fprintf(stderr, "wolfSSL_Init error.\n");
return exitVal; return exitVal;
} }
/* No-op when debugging is not compiled in */ /* No-op when debugging is not compiled in */
wolfSSL_Debugging_ON(); wolfSSL_Debugging_ON();
if ( (ctx = wolfSSL_CTX_new( if ((ctx = wolfSSL_CTX_new(
#ifdef WOLFSSL_DTLS13 #ifdef WOLFSSL_DTLS13
wolfDTLSv1_3_client_method() wolfDTLSv1_3_client_method()
#else #else
@ -84,8 +86,8 @@ int main (int argc, char** argv)
} }
/* Load certificates into ctx variable */ /* Load certificates into ctx variable */
if (wolfSSL_CTX_load_verify_locations(ctx, caCertLoc, 0) if (wolfSSL_CTX_load_verify_locations(ctx, caCertLoc, NULL)
!= SSL_SUCCESS) { != WOLFSSL_SUCCESS) {
fprintf(stderr, "Error loading %s, please check the file.\n", caCertLoc); fprintf(stderr, "Error loading %s, please check the file.\n", caCertLoc);
goto cleanup; goto cleanup;
} }
@ -112,7 +114,7 @@ int main (int argc, char** argv)
goto cleanup; goto cleanup;
} }
if ( (sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) { if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
perror("socket()"); perror("socket()");
goto cleanup; goto cleanup;
} }
@ -124,7 +126,7 @@ int main (int argc, char** argv)
} }
/* Perform SSL connection */ /* Perform SSL connection */
if (wolfSSL_connect(ssl) != SSL_SUCCESS) { if (wolfSSL_connect(ssl) != WOLFSSL_SUCCESS) {
err = wolfSSL_get_error(ssl, 0); err = wolfSSL_get_error(ssl, 0);
fprintf(stderr, "err = %d, %s\n", err, wolfSSL_ERR_reason_error_string(err)); fprintf(stderr, "err = %d, %s\n", err, wolfSSL_ERR_reason_error_string(err));
fprintf(stderr, "wolfSSL_connect failed\n"); fprintf(stderr, "wolfSSL_connect failed\n");
@ -145,7 +147,8 @@ int main (int argc, char** argv)
/* Send sendLine to the server */ /* Send sendLine to the server */
if (wolfSSL_write(ssl, sendLine, strlen(sendLine)) != strlen(sendLine)) { if (wolfSSL_write(ssl, sendLine, strlen(sendLine)) != strlen(sendLine)) {
err = wolfSSL_get_error(ssl, 0); err = wolfSSL_get_error(ssl, 0);
fprintf(stderr, "err = %d, %s\n", err, wolfSSL_ERR_reason_error_string(err)); fprintf(stderr, "err = %d, %s\n", err,
wolfSSL_ERR_reason_error_string(err));
fprintf(stderr, "wolfSSL_write failed\n"); fprintf(stderr, "wolfSSL_write failed\n");
goto cleanup; goto cleanup;
} }
@ -160,7 +163,8 @@ int main (int argc, char** argv)
} }
else { else {
err = wolfSSL_get_error(ssl, 0); err = wolfSSL_get_error(ssl, 0);
fprintf(stderr, "err = %d, %s\n", err, wolfSSL_ERR_reason_error_string(err)); fprintf(stderr, "err = %d, %s\n", err,
wolfSSL_ERR_reason_error_string(err));
fprintf(stderr, "wolfSSL_read failed\n"); fprintf(stderr, "wolfSSL_read failed\n");
goto cleanup; goto cleanup;
} }
@ -177,7 +181,8 @@ cleanup:
ret = wolfSSL_shutdown(ssl); ret = wolfSSL_shutdown(ssl);
if (ret != WOLFSSL_SUCCESS) { if (ret != WOLFSSL_SUCCESS) {
err = wolfSSL_get_error(ssl, 0); err = wolfSSL_get_error(ssl, 0);
fprintf(stderr, "err = %d, %s\n", err, wolfSSL_ERR_reason_error_string(err)); fprintf(stderr, "err = %d, %s\n", err,
wolfSSL_ERR_reason_error_string(err));
fprintf(stderr, "wolfSSL_shutdown failed\n"); fprintf(stderr, "wolfSSL_shutdown failed\n");
} }
wolfSSL_free(ssl); wolfSSL_free(ssl);

4
dtls/server-dtls13-event.c
View File

@ -58,7 +58,7 @@ typedef struct conn_ctx {
WOLFSSL* ssl; WOLFSSL* ssl;
struct event* readEv; struct event* readEv;
struct event* writeEv; struct event* writeEv;
char waitingOnData:1; unsigned char waitingOnData:1;
} conn_ctx; } conn_ctx;
WOLFSSL_CTX* ctx = NULL; WOLFSSL_CTX* ctx = NULL;
@ -286,7 +286,7 @@ static void newConn(evutil_socket_t fd, short events, void* arg)
static void setHsTimeout(WOLFSSL* ssl, struct timeval *tv) static void setHsTimeout(WOLFSSL* ssl, struct timeval *tv)
{ {
int timeout = wolfSSL_dtls_get_current_timeout(ssl); int timeout = wolfSSL_dtls_get_current_timeout(ssl);
#ifndef USE_DTLS12 #ifdef WOLFSSL_DTLS13
if (wolfSSL_dtls13_use_quick_timeout(ssl)) { if (wolfSSL_dtls13_use_quick_timeout(ssl)) {
if (timeout >= QUICK_MULT) if (timeout >= QUICK_MULT)
tv->tv_sec = timeout / QUICK_MULT; tv->tv_sec = timeout / QUICK_MULT;

26
dtls/server-dtls13.c
View File

@ -1,6 +1,6 @@
/* server-dtls13.c /* server-dtls13.c
* *
* Copyright (C) 2006-2022 wolfSSL Inc. * Copyright (C) 2006-2024 wolfSSL Inc.
* *
* This file is part of wolfSSL. (formerly known as CyaSSL) * This file is part of wolfSSL. (formerly known as CyaSSL)
* *
@ -26,7 +26,9 @@
* Define USE_DTLS12 to use DTLS 1.2 instead of DTLS 1.3 * Define USE_DTLS12 to use DTLS 1.2 instead of DTLS 1.3
*/ */
#ifndef WOLFSSL_USER_SETTINGS
#include <wolfssl/options.h> #include <wolfssl/options.h>
#endif
#include <stdio.h> /* standard in/out procedures */ #include <stdio.h> /* standard in/out procedures */
#include <stdlib.h> /* defines system calls */ #include <stdlib.h> /* defines system calls */
#include <string.h> /* necessary for memset */ #include <string.h> /* necessary for memset */
@ -83,19 +85,19 @@ int main(int argc, char** argv)
} }
/* Load CA certificates */ /* Load CA certificates */
if (wolfSSL_CTX_load_verify_locations(ctx,caCertLoc,0) != if (wolfSSL_CTX_load_verify_locations(ctx,caCertLoc,0) !=
SSL_SUCCESS) { WOLFSSL_SUCCESS) {
fprintf(stderr, "Error loading %s, please check the file.\n", caCertLoc); fprintf(stderr, "Error loading %s, please check the file.\n", caCertLoc);
goto cleanup; goto cleanup;
} }
/* Load server certificates */ /* Load server certificates */
if (wolfSSL_CTX_use_certificate_file(ctx, servCertLoc, SSL_FILETYPE_PEM) != if (wolfSSL_CTX_use_certificate_file(ctx, servCertLoc,
SSL_SUCCESS) { WOLFSSL_FILETYPE_PEM) != WOLFSSL_SUCCESS) {
fprintf(stderr, "Error loading %s, please check the file.\n", servCertLoc); fprintf(stderr, "Error loading %s, please check the file.\n", servCertLoc);
goto cleanup; goto cleanup;
} }
/* Load server Keys */ /* Load server Keys */
if (wolfSSL_CTX_use_PrivateKey_file(ctx, servKeyLoc, if (wolfSSL_CTX_use_PrivateKey_file(ctx, servKeyLoc,
SSL_FILETYPE_PEM) != SSL_SUCCESS) { WOLFSSL_FILETYPE_PEM) != WOLFSSL_SUCCESS) {
fprintf(stderr, "Error loading %s, please check the file.\n", servKeyLoc); fprintf(stderr, "Error loading %s, please check the file.\n", servKeyLoc);
goto cleanup; goto cleanup;
} }
@ -153,9 +155,10 @@ int main(int argc, char** argv)
break; break;
} }
if (wolfSSL_accept(ssl) != SSL_SUCCESS) { if (wolfSSL_accept(ssl) != WOLFSSL_SUCCESS) {
err = wolfSSL_get_error(ssl, 0); err = wolfSSL_get_error(ssl, 0);
fprintf(stderr, "error = %d, %s\n", err, wolfSSL_ERR_reason_error_string(err)); fprintf(stderr, "error = %d, %s\n", err,
wolfSSL_ERR_reason_error_string(err));
fprintf(stderr, "SSL_accept failed.\n"); fprintf(stderr, "SSL_accept failed.\n");
goto cleanup; goto cleanup;
} }
@ -171,14 +174,16 @@ int main(int argc, char** argv)
err = wolfSSL_get_error(ssl, 0); err = wolfSSL_get_error(ssl, 0);
if (err == WOLFSSL_ERROR_ZERO_RETURN) /* Received shutdown */ if (err == WOLFSSL_ERROR_ZERO_RETURN) /* Received shutdown */
break; break;
fprintf(stderr, "error = %d, %s\n", err, wolfSSL_ERR_reason_error_string(err)); fprintf(stderr, "error = %d, %s\n", err,
wolfSSL_ERR_reason_error_string(err));
fprintf(stderr, "SSL_read failed.\n"); fprintf(stderr, "SSL_read failed.\n");
goto cleanup; goto cleanup;
} }
printf("Sending reply.\n"); printf("Sending reply.\n");
if (wolfSSL_write(ssl, ack, sizeof(ack)) < 0) { if (wolfSSL_write(ssl, ack, sizeof(ack)) < 0) {
err = wolfSSL_get_error(ssl, 0); err = wolfSSL_get_error(ssl, 0);
fprintf(stderr, "error = %d, %s\n", err, wolfSSL_ERR_reason_error_string(err)); fprintf(stderr, "error = %d, %s\n", err,
wolfSSL_ERR_reason_error_string(err));
fprintf(stderr, "wolfSSL_write failed.\n"); fprintf(stderr, "wolfSSL_write failed.\n");
goto cleanup; goto cleanup;
} }
@ -192,7 +197,8 @@ int main(int argc, char** argv)
ret = wolfSSL_shutdown(ssl); ret = wolfSSL_shutdown(ssl);
if (ret != WOLFSSL_SUCCESS) { if (ret != WOLFSSL_SUCCESS) {
err = wolfSSL_get_error(ssl, 0); err = wolfSSL_get_error(ssl, 0);
fprintf(stderr, "err = %d, %s\n", err, wolfSSL_ERR_reason_error_string(err)); fprintf(stderr, "err = %d, %s\n", err,
wolfSSL_ERR_reason_error_string(err));
fprintf(stderr, "wolfSSL_shutdown failed\n"); fprintf(stderr, "wolfSSL_shutdown failed\n");
} }
wolfSSL_free(ssl); wolfSSL_free(ssl);