Merge pull request #302 from SparkiDev/tls13_psk_multi_id

PSK example: add TLS v1.3 client/server example supporting multiple i…
pull/70/head
David Garske 2022-03-08 10:03:38 -08:00 committed by GitHub
commit 2d875419b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 501 additions and 25 deletions

3
.gitignore vendored
View File

@ -59,12 +59,15 @@ android/wolfssljni-ndk-sample/proguard-project.txt
/dtls/server-dtls
/dtls/server-udp
/psk/client-psk-bio-custom
/psk/client-psk-nonblocking
/psk/client-psk-resume
/psk/client-psk-tls13-multi-id
/psk/client-psk
/psk/client-tcp
/psk/server-psk-nonblocking
/psk/server-psk-threaded
/psk/server-psk-tls13-multi-id
/psk/server-psk
/psk/server-tcp

View File

@ -1,13 +1,26 @@
CC=gcc
CFLAGS=-Wall -I/usr/local/include
LIBS=-lwolfssl -lm -L/usr/local/lib
# PSK Examples Makefile
CC = gcc
LIB_PATH = /usr/local
CFLAGS = -Wall -I$(LIB_PATH)/include
LIBS = -L$(LIB_PATH)/lib -lm
# option variables
DYN_LIB = -lwolfssl
STATIC_LIB = $(LIB_PATH)/lib/libwolfssl.a
DEBUG_FLAGS = -g -DDEBUG
DEBUG_INC_PATHS = -MD
OPTIMIZE = -Os
# Options
# For debug (./configure --enable-debug --disable-shared)
#LIBS=/usr/local/lib/libwolfssl.a
#CFLAGS+=-g -DDEBUG
# Uncomment DEBUG_FLAGS and STATIC_LIB (comment DYN_LIB)
#CFLAGS+=$(DEBUG_FLAGS)
CFLAGS+=$(OPTIMIZE)
#LIBS+=$(STATIC_LIB)
LIBS+=$(DYN_LIB)
all: client-tcp client-psk client-psk-nonblocking client-psk-resume server-tcp server-psk server-psk-nonblocking server-psk-threaded client-psk-bio-custom
all: client-tcp client-psk client-psk-nonblocking client-psk-resume client-psk-tls13-multi-id server-tcp server-psk server-psk-nonblocking server-psk-threaded client-psk-bio-custom server-psk-tls13-multi-id
client-tcp: client-tcp.o
$(CC) -o $@ $^ $(CFLAGS)
@ -21,6 +34,9 @@ client-psk-nonblocking: client-psk-nonblocking.o
client-psk-resume: client-psk-resume.o
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
client-psk-tls13-multi-id: client-psk-tls13-multi-id.o
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
server-tcp: server-tcp.o
$(CC) -o $@ $^ $(CFLAGS)
@ -36,7 +52,10 @@ server-psk-threaded: server-psk-threaded.o
client-psk-bio-custom: client-psk-bio-custom.o
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
server-psk-tls13-multi-id: server-psk-tls13-multi-id.o
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
.PHONY: clean all
clean:
rm -f *.o client-tcp client-psk client-psk-nonblocking client-psk-resume server-tcp server-psk server-psk-nonblocking server-psk-threaded client-psk-bio-custom
rm -f *.o client-tcp client-psk client-psk-nonblocking client-psk-resume client-psk-tls13-multi-id server-tcp server-psk server-psk-nonblocking server-psk-threaded client-psk-bio-custom server-psk-tls13-multi-id

View File

@ -99,7 +99,7 @@ static long bioCTRLCb(WOLFSSL_BIO* bio, int cmd, long larg, void* data)
return ret;
}
#ifndef NO_PSK
/*
*psk client set up.
*/
@ -123,7 +123,7 @@ static inline unsigned int My_Psk_Client_Cb(WOLFSSL* ssl, const char* hint,
return PSK_KEY_LEN;
}
#endif
static int createSocket(char* ip)
{
@ -222,8 +222,12 @@ int main(int argc, char **argv)
goto exit;
}
#ifndef NO_PSK
/* set up pre shared keys */
wolfSSL_CTX_set_psk_client_callback(ctx, My_Psk_Client_Cb);
#else
fprintf(stderr, "Warning: wolfSSL not built with PSK (--enable-psk)\n");
#endif
/* creat wolfssl object after each tcp connect */
if ( (ssl = wolfSSL_new(ctx)) == NULL) {

View File

@ -46,6 +46,7 @@ enum {
TEST_ERROR_READY
};
#ifndef NO_PSK
/*
*psk client set up.
*/
@ -69,6 +70,7 @@ static inline unsigned int My_Psk_Client_Cb(WOLFSSL* ssl, const char* hint,
return PSK_KEY_LEN;
}
#endif
int main(int argc, char **argv)
{
@ -145,8 +147,12 @@ int main(int argc, char **argv)
goto exit;
}
#ifndef NO_PSK
/* set up pre shared keys */
wolfSSL_CTX_set_psk_client_callback(ctx,My_Psk_Client_Cb);
#else
fprintf(stderr, "Warning: wolfSSL not built with PSK (--enable-psk)\n");
#endif
/* create wolfSSL object after each tcp connect */
if ((ssl = wolfSSL_new(ctx)) == NULL) {

View File

@ -37,6 +37,7 @@
#define SERV_PORT 11111 /* default port*/
#define PSK_KEY_LEN 4
#ifndef NO_PSK
/*
*psk client set up.
*/
@ -60,6 +61,7 @@ static inline unsigned int My_Psk_Client_Cb(WOLFSSL* ssl, const char* hint,
return PSK_KEY_LEN;
}
#endif
int main(int argc, char **argv){
@ -110,8 +112,12 @@ int main(int argc, char **argv){
ret = -1; goto exit;
}
#ifndef NO_PSK
/* set up pre shared keys */
wolfSSL_CTX_set_psk_client_callback(ctx, My_Psk_Client_Cb);
#else
fprintf(stderr, "Warning: wolfSSL not built with PSK (--enable-psk)\n");
#endif
/* create wolfSSL object after each tcp connect */
if ( (ssl = wolfSSL_new(ctx)) == NULL) {

View File

@ -0,0 +1,192 @@
/* client-psk-tls13-multi-id.c
*
* Copyright (C) 2006-2022 wolfSSL Inc.
*
* This file is part of wolfSSL. (formerly known as CyaSSL)
*
* wolfSSL is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* wolfSSL is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* A client example using a TCP connection with PSK security showing
* PSK with identity.
*/
#include <wolfssl/options.h> /* included for options sync */
#include <wolfssl/ssl.h> /* must include this to use wolfSSL security */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <arpa/inet.h>
#include <signal.h>
#include <unistd.h>
#define MAXLINE 256 /* max text line length */
#define SERV_PORT 11111 /* default port*/
#define PSK_KEY_LEN 4
#ifndef NO_PSK
/*
* psk client set up.
*/
static inline unsigned int My_Tls13_Psk_Client_Cs_Cb(WOLFSSL* ssl,
const char* hint, char* identity, unsigned int id_max_len,
unsigned char* key, unsigned int key_max_len, const char* ciphersuite)
{
(void)ssl;
(void)hint;
(void)key_max_len;
if (strncmp(ciphersuite, "TLS13-AES128-GCM-SHA256",
XSTRLEN(ciphersuite)) == 0) {
/* identity is OpenSSL testing default for openssl s_client, keep same*/
strncpy(identity, "Client_Id_AES", id_max_len);
/* test key n hex is 0x1a2b3c4d */
key[0] = 0x1a;
key[1] = 0x2b;
key[2] = 0x3c;
key[3] = 0x4d;
}
else if (strncmp(ciphersuite, "TLS13-CHACHA20-POLY1305-SHA256",
XSTRLEN(ciphersuite)) == 0) {
/* identity is OpenSSL testing default for openssl s_client, keep same*/
strncpy(identity, "Client_Id_ChaCha", id_max_len);
/* test key n hex is 0xa1b2c3d4 */
key[0] = 0xa1;
key[1] = 0xb2;
key[2] = 0xc3;
key[3] = 0xd4;
}
else {
return 0;
}
return PSK_KEY_LEN;
}
#endif
int main(int argc, char **argv)
{
int ret;
int sockfd = SOCKET_INVALID;
char sendline[MAXLINE]="Hello Server"; /* string to send to the server */
char recvline[MAXLINE]; /* string received from the server */
struct sockaddr_in servaddr;;
WOLFSSL* ssl = NULL;
WOLFSSL_CTX* ctx = NULL;
/* must include an ip address of this will flag */
if (argc != 2) {
printf("Usage: tcpClient <IPaddress>\n");
return -1;
}
/* create a stream socket using tcp,internet protocal IPv4,
* full-duplex stream */
sockfd = socket(AF_INET, SOCK_STREAM, 0);
/* places n zero-valued bytes in the address servaddr */
memset(&servaddr, 0, sizeof(servaddr));
servaddr.sin_family = AF_INET;
servaddr.sin_port = htons(SERV_PORT);
/* converts IPv4 addresses from text to binary form */
ret = inet_pton(AF_INET, argv[1], &servaddr.sin_addr);
if (ret != 1) {
printf("inet_pton error\n");
ret = -1;
goto exit;
}
/* attempts to make a connection on a socket */
ret = connect(sockfd, (struct sockaddr *) &servaddr, sizeof(servaddr));
if (ret != 0) {
printf("Connection Error\n");
ret = -1;
goto exit;
}
wolfSSL_Init(); /* initialize wolfSSL */
/* create and initialize WOLFSSL_CTX structure */
if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method())) == NULL) {
fprintf(stderr, "wolfSSL_CTX_new error.\n");
ret = -1;
goto exit;
}
#ifndef NO_PSK
/* set up pre shared keys */
wolfSSL_CTX_set_psk_client_cs_callback(ctx, My_Tls13_Psk_Client_Cs_Cb);
#else
fprintf(stderr, "Warning: wolfSSL not built with PSK (--enable-psk)\n");
#endif
/* creat wolfssl object after each tcp connect */
if ( (ssl = wolfSSL_new(ctx)) == NULL) {
fprintf(stderr, "wolfSSL_new error.\n");
ret = -1;
goto exit;
}
/* associate the file descriptor with the session */
ret = wolfSSL_set_fd(ssl, sockfd);
if (ret != WOLFSSL_SUCCESS) {
goto exit;
}
/* write string to the server */
if (wolfSSL_write(ssl, sendline, MAXLINE) != sizeof(sendline)) {
printf("Write Error to Server\n");
ret = -1;
goto exit;
}
/* check if server ended before client could read a response */
if (wolfSSL_read(ssl, recvline, MAXLINE) < 0 ) {
printf("Client: Server Terminated Prematurely!\n");
ret = -1;
goto exit;
}
WOLFSSL_CIPHER* cipher = wolfSSL_get_current_cipher(ssl);
printf("Cipher suite: %s\n", wolfSSL_CIPHER_get_name(cipher));
/* show message from the server */
printf("Server Message: %s\n", recvline);
ret = 0;
exit:
/* Cleanup and return */
if (ssl)
wolfSSL_free(ssl); /* Free the wolfSSL object */
if (sockfd != SOCKET_INVALID)
close(sockfd); /* Close the socket */
if (ctx)
wolfSSL_CTX_free(ctx); /* Free the wolfSSL context object */
wolfSSL_Cleanup(); /* Cleanup the wolfSSL environment */
return ret; /* Return reporting a success */
}

View File

@ -35,6 +35,7 @@
#define SERV_PORT 11111 /* default port*/
#define PSK_KEY_LEN 4
#ifndef NO_PSK
/*
*psk client set up.
*/
@ -58,6 +59,7 @@ static inline unsigned int My_Psk_Client_Cb(WOLFSSL* ssl, const char* hint,
return PSK_KEY_LEN;
}
#endif
int main(int argc, char **argv)
{
@ -112,8 +114,12 @@ int main(int argc, char **argv)
goto exit;
}
#ifndef NO_PSK
/* set up pre shared keys */
wolfSSL_CTX_set_psk_client_callback(ctx, My_Psk_Client_Cb);
#else
fprintf(stderr, "Warning: wolfSSL not built with PSK (--enable-psk)\n");
#endif
/* creat wolfssl object after each tcp connect */
if ( (ssl = wolfSSL_new(ctx)) == NULL) {

View File

@ -1,5 +1,5 @@
/* server-psk-nonblocking.c
* A server ecample using a TCP connection with PSK security and non blocking.
* A server example using a TCP connection with PSK security and non blocking.
*
* Copyright (C) 2006-2020 wolfSSL Inc.
*
@ -49,6 +49,7 @@ enum{
TEST_ERROR_READY
};
#ifndef NO_PSK
/*
* Used for finding psk value.
*/
@ -69,7 +70,7 @@ static inline unsigned int my_psk_server_cb(WOLFSSL* ssl, const char* identity,
return PSK_KEY_LEN;
}
#endif
int main()
{
@ -152,10 +153,14 @@ int main()
return 1;
}
#ifndef NO_PSK
/* use psk suite for security */
wolfSSL_CTX_set_psk_server_callback(ctx, my_psk_server_cb);
wolfSSL_CTX_use_psk_identity_hint(ctx, "wolfssl server");
#else
fprintf(stderr, "Warning: wolfSSL not built with PSK (--enable-psk)\n");
#endif
if (wolfSSL_CTX_set_cipher_list(ctx, suites) != WOLFSSL_SUCCESS) {
printf("Fatal error : server can't set cipher list\n");

View File

@ -1,5 +1,5 @@
/* server-psk-threaded.c
* A server ecample using a multi-threaded TCP connection with PSK security.
* A server example using a multi-threaded TCP connection with PSK security.
*
* Copyright (C) 2006-2020 wolfSSL Inc.
*
@ -42,6 +42,7 @@
WOLFSSL_CTX* ctx; /* global so it's shared by threads */
#ifndef NO_PSK
/*
* Identify which psk key to use.
*/
@ -63,6 +64,7 @@ static inline unsigned int my_psk_server_cb(WOLFSSL* ssl, const char* identity,
return PSK_KEY_LEN;
}
#endif
/*
* Process handled by a thread.
@ -185,6 +187,7 @@ int main()
printf("Fatal error : wolfSSL_CTX_new error\n");
}
#ifndef NO_PSK
/* use psk suite for security */
wolfSSL_CTX_set_psk_server_callback(ctx, my_psk_server_cb);
@ -193,6 +196,9 @@ int main()
printf("Fatal error : ctx use psk identity hint returned %d\n", ret);
return ret;
}
#else
fprintf(stderr, "Warning: wolfSSL not built with PSK (--enable-psk)\n");
#endif
if ((ret = wolfSSL_CTX_set_cipher_list(ctx, suites)) != WOLFSSL_SUCCESS) {
printf("Fatal error : server can't set cipher list");

View File

@ -0,0 +1,223 @@
/* server-psk-tls13-multi-id.c
*
* Copyright (C) 2006-2022 wolfSSL Inc.
*
* This file is part of wolfSSL. (formerly known as CyaSSL)
*
* wolfSSL is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* wolfSSL is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* A server example using a TCP connection with PSK security showing
* PSK with identity.
*/
#include <wolfssl/options.h> /* included for options sync */
#include <wolfssl/ssl.h> /* include wolfSSL security */
#include <sys/socket.h>
#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <arpa/inet.h>
#define MAXLINE 4096
#define LISTENQ 1024
#define SERV_PORT 11111
#define PSK_KEY_LEN 4
#define dhParamFile "../certs/dh2048.pem"
#ifndef NO_PSK
/*
* Identify which psk key to use.
*/
static unsigned int my_tls13_psk_server_cb(WOLFSSL* ssl, const char* identity,
unsigned char* key, unsigned int key_max_len, const char** ciphersuite)
{
(void)ssl;
(void)key_max_len;
if (strncmp(identity, "Client_Id_AES", 14) == 0) {
key[0] = 0x1a;
key[1] = 0x2b;
key[2] = 0x3c;
key[3] = 0x4d;
*ciphersuite = "TLS13-AES128-GCM-SHA256";
}
else if (strncmp(identity, "Client_Id_ChaCha", 17) == 0) {
key[0] = 0xa1;
key[1] = 0xb2;
key[2] = 0xc3;
key[3] = 0xd4;
*ciphersuite = "TLS13-CHACHA20-POLY1305-SHA256";
}
else {
return 0;
}
return PSK_KEY_LEN;
}
#endif
int main()
{
int n; /* length of string read */
int listenfd, connfd, ret;
int opt;
char buff[MAXLINE];
char buf[MAXLINE]; /* string read from client */
char response[] = "I hear ya for shizzle";
char suites[] = "TLS13-CHACHA20-POLY1305-SHA256:"
"TLS13-AES128-GCM-SHA256:"
"TLS13-AES256-GCM-SHA384:";
struct sockaddr_in cliAddr, servAddr;
socklen_t cliLen;
WOLFSSL_CTX* ctx;
#if defined(DEBUG_WOLFSSL)
wolfSSL_Debugging_ON();
#endif
/* set up server address and port */
memset(&servAddr, 0, sizeof(servAddr));
servAddr.sin_family = AF_INET;
servAddr.sin_addr.s_addr = htonl(INADDR_ANY);
servAddr.sin_port = htons(SERV_PORT);
/* find a socket */
listenfd = socket(AF_INET, SOCK_STREAM, 0);
if (listenfd < 0) {
printf("Fatal error : socket error\n");
return 1;
}
/* bind to a socket */
opt = 1;
if (setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, (const void *)&opt,
sizeof(int)) != 0) {
printf("Fatal error : setsockopt error\n");
return 1;
}
if (bind(listenfd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0) {
printf("Fatal error : bind error\n");
return 1;
}
/* listen to the socket */
if (listen(listenfd, LISTENQ) < 0) {
printf("Fatal error : listen error\n");
return 1;
}
wolfSSL_Init();
/* create ctx and configure certificates */
if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_server_method())) == NULL) {
printf("Fatal error : wolfSSL_CTX_new error\n");
return 1;
}
#ifndef NO_PSK
/* use psk suite for security */
wolfSSL_CTX_set_psk_server_tls13_callback(ctx, my_tls13_psk_server_cb);
if ((ret = wolfSSL_CTX_use_psk_identity_hint(ctx, "wolfssl server"))
!= WOLFSSL_SUCCESS) {
printf("Fatal error : ctx use psk identity hint returned %d\n", ret);
return ret;
}
#else
fprintf(stderr, "Warning: wolfSSL not built with PSK (--enable-psk)\n");
#endif
if ((ret = wolfSSL_CTX_set_cipher_list(ctx, suites)) != WOLFSSL_SUCCESS) {
printf("Fatal error : server set cipher list returned %d\n", ret);
return ret;
}
#ifndef NO_DH
if ((ret = wolfSSL_CTX_SetTmpDH_file(ctx, dhParamFile, WOLFSSL_FILETYPE_PEM)
) != WOLFSSL_SUCCESS) {
printf("Fatal error: server set temp DH params returned %d\n", ret);
return ret;
}
#endif
/* main loop for accepting and responding to clients */
for ( ; ; ) {
WOLFSSL* ssl;
cliLen = sizeof(cliAddr);
connfd = accept(listenfd, (struct sockaddr *) &cliAddr, &cliLen);
if (connfd < 0) {
printf("Fatal error : accept error\n");
return 1;
}
else {
printf("Connection from %s, port %d\n",
inet_ntop(AF_INET, &cliAddr.sin_addr, buff, sizeof(buff)),
ntohs(cliAddr.sin_port));
/* create WOLFSSL object and respond */
if ((ssl = wolfSSL_new(ctx)) == NULL) {
printf("Fatal error : wolfSSL_new error\n");
return 1;
}
/* sets the file descriptor of the socket for the ssl session */
wolfSSL_set_fd(ssl, connfd);
/* making sure buffered to store data sent from client is empty */
memset(buf, 0, MAXLINE);
/* reads and displays data sent by client if no errors occur */
n = wolfSSL_read(ssl, buf, MAXLINE);
if (n > 0) {
printf("%s\n", buf);
/* server response */
if (wolfSSL_write(ssl, response, strlen(response)) >
strlen(response)) {
printf("Fatal error : respond: write error\n");
return 1;
}
}
if (n < 0) {
printf("Fatal error :respond: read error\n");
return 1;
}
/* closes the connections after responding */
wolfSSL_shutdown(ssl);
wolfSSL_free(ssl);
if (close(connfd) == -1) {
printf("Fatal error : close error\n");
return 1;
}
}
}
/* free up memory used by wolfSSL */
wolfSSL_CTX_free(ctx);
wolfSSL_Cleanup();
return 0;
}

View File

@ -1,5 +1,5 @@
/* server-psk.c
* A server ecample using a TCP connection with PSK security.
* A server example using a TCP connection with PSK security.
*
* Copyright (C) 2006-2020 wolfSSL Inc.
*
@ -38,6 +38,7 @@
#define PSK_KEY_LEN 4
#define dhParamFile "../certs/dh2048.pem"
#ifndef NO_PSK
/*
* Identify which psk key to use.
*/
@ -58,6 +59,7 @@ static unsigned int my_psk_server_cb(WOLFSSL* ssl, const char* identity,
return PSK_KEY_LEN;
}
#endif
int main()
{
@ -138,6 +140,7 @@ int main()
return 1;
}
#ifndef NO_PSK
/* use psk suite for security */
wolfSSL_CTX_set_psk_server_callback(ctx, my_psk_server_cb);
@ -146,6 +149,9 @@ int main()
printf("Fatal error : ctx use psk identity hint returned %d\n", ret);
return ret;
}
#else
fprintf(stderr, "Warning: wolfSSL not built with PSK (--enable-psk)\n");
#endif
if ((ret = wolfSSL_CTX_set_cipher_list(ctx, suites)) != WOLFSSL_SUCCESS) {
printf("Fatal error : server set cipher list returned %d\n", ret);

View File

@ -1,5 +1,5 @@
/* server-tcp.c
* A server ecample using a TCP connection.
* A server example using a TCP connection.
*
* Copyright (C) 2006-2020 wolfSSL Inc.
*