add examples for setting up an ech server and
connecting to it from a client. requested from https://github.com/wolfSSL/wolfssl/issues/6568pull/391/head
John Bland
parent
823b294420
commit
615c05c346
|
|
@ -105,6 +105,8 @@ android/wolfssljni-ndk-sample/proguard-project.txt
|
||||||
/tls/server-tls-uart
|
/tls/server-tls-uart
|
||||||
/tls/server-tls-verifycallback
|
/tls/server-tls-verifycallback
|
||||||
/tls/server-tls-writedup
|
/tls/server-tls-writedup
|
||||||
|
/tls/client-ech-local
|
||||||
|
/tls/server-ech-local
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,202 @@
|
||||||
|
/* client-ech-local.c
|
||||||
|
*
|
||||||
|
* Copyright (C) 2023 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
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* the usual suspects */
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
/* socket includes */
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
/* wolfSSL */
|
||||||
|
#include <wolfssl/options.h>
|
||||||
|
#include <wolfssl/ssl.h>
|
||||||
|
|
||||||
|
#define DEFAULT_PORT 11111
|
||||||
|
|
||||||
|
#define CERT_FILE "../certs/ca-cert.pem"
|
||||||
|
|
||||||
|
#ifdef HAVE_ECH
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
int sockfd;
|
||||||
|
struct sockaddr_in servAddr;
|
||||||
|
char buff[256];
|
||||||
|
size_t len;
|
||||||
|
int ret;
|
||||||
|
const char* privateName = "ech-private-name.com";
|
||||||
|
int privateNameLen = strlen(privateName);
|
||||||
|
|
||||||
|
/* declare wolfSSL objects */
|
||||||
|
WOLFSSL_CTX* ctx;
|
||||||
|
WOLFSSL* ssl;
|
||||||
|
|
||||||
|
/* Check for proper calling convention */
|
||||||
|
if (argc != 2) {
|
||||||
|
printf("usage: %s <base64 ech config>\n", argv[0]);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Create a socket that uses an internet IPv4 address,
|
||||||
|
* Sets the socket to be stream based (TCP),
|
||||||
|
* 0 means choose the default protocol. */
|
||||||
|
if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
|
||||||
|
fprintf(stderr, "ERROR: failed to create the socket\n");
|
||||||
|
ret = -1;
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Initialize the server address struct with zeros */
|
||||||
|
memset(&servAddr, 0, sizeof(servAddr));
|
||||||
|
|
||||||
|
/* Fill in the server address */
|
||||||
|
servAddr.sin_family = AF_INET; /* using IPv4 */
|
||||||
|
servAddr.sin_port = htons(DEFAULT_PORT); /* on DEFAULT_PORT */
|
||||||
|
|
||||||
|
/* Get the server IPv4 address from the command line call */
|
||||||
|
if (inet_pton(AF_INET, "127.0.0.1", &servAddr.sin_addr) != 1) {
|
||||||
|
fprintf(stderr, "ERROR: invalid address\n");
|
||||||
|
ret = -1;
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Connect to the server */
|
||||||
|
if ((ret = connect(sockfd, (struct sockaddr*) &servAddr, sizeof(servAddr)))
|
||||||
|
== -1) {
|
||||||
|
fprintf(stderr, "ERROR: failed to connect\n");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*---------------------------------*/
|
||||||
|
/* Start of wolfSSL initialization and configuration */
|
||||||
|
/*---------------------------------*/
|
||||||
|
/* Initialize wolfSSL */
|
||||||
|
if ((ret = wolfSSL_Init()) != WOLFSSL_SUCCESS) {
|
||||||
|
fprintf(stderr, "ERROR: Failed to initialize the library\n");
|
||||||
|
goto socket_cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Create and initialize WOLFSSL_CTX */
|
||||||
|
if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method())) == NULL) {
|
||||||
|
fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
|
||||||
|
ret = -1;
|
||||||
|
goto socket_cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Load client certificates into WOLFSSL_CTX */
|
||||||
|
if ((ret = wolfSSL_CTX_load_verify_locations(ctx, CERT_FILE, NULL))
|
||||||
|
!= SSL_SUCCESS) {
|
||||||
|
fprintf(stderr, "ERROR: failed to load %s, please check the file.\n",
|
||||||
|
CERT_FILE);
|
||||||
|
goto ctx_cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Create a WOLFSSL object */
|
||||||
|
if ((ssl = wolfSSL_new(ctx)) == NULL) {
|
||||||
|
fprintf(stderr, "ERROR: failed to create WOLFSSL object\n");
|
||||||
|
ret = -1;
|
||||||
|
goto ctx_cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (wolfSSL_SetEchConfigsBase64(ssl, argv[1], strlen(argv[1])) !=
|
||||||
|
WOLFSSL_SUCCESS) {
|
||||||
|
fprintf(stderr, "ERROR: Failed to wolfSSL_SetEchConfigsBase64\n");
|
||||||
|
ret = -1;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (wolfSSL_UseSNI(ssl, WOLFSSL_SNI_HOST_NAME, privateName,
|
||||||
|
privateNameLen) != WOLFSSL_SUCCESS) {
|
||||||
|
fprintf(stderr, "ERROR: Failed to wolfSSL_UseSNI\n");
|
||||||
|
ret = -1;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Attach wolfSSL to the socket */
|
||||||
|
if ((ret = wolfSSL_set_fd(ssl, sockfd)) != WOLFSSL_SUCCESS) {
|
||||||
|
fprintf(stderr, "ERROR: Failed to set the file descriptor\n");
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Connect to wolfSSL on the server side */
|
||||||
|
if ((ret = wolfSSL_connect(ssl)) != SSL_SUCCESS) {
|
||||||
|
fprintf(stderr, "ERROR: failed to connect to wolfSSL\n");
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Get a message for the server from stdin */
|
||||||
|
printf("Message for server: ");
|
||||||
|
memset(buff, 0, sizeof(buff));
|
||||||
|
if (fgets(buff, sizeof(buff), stdin) == NULL) {
|
||||||
|
fprintf(stderr, "ERROR: failed to get message for server\n");
|
||||||
|
ret = -1;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
len = strnlen(buff, sizeof(buff));
|
||||||
|
|
||||||
|
/* Send the message to the server */
|
||||||
|
if ((ret = wolfSSL_write(ssl, buff, len)) != len) {
|
||||||
|
fprintf(stderr, "ERROR: failed to write entire message\n");
|
||||||
|
fprintf(stderr, "%d bytes of %d bytes were sent", ret, (int) len);
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Read the server data into our buff array */
|
||||||
|
memset(buff, 0, sizeof(buff));
|
||||||
|
if ((ret = wolfSSL_read(ssl, buff, sizeof(buff)-1)) == -1) {
|
||||||
|
fprintf(stderr, "ERROR: failed to read\n");
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Print to stdout any data the server sends */
|
||||||
|
printf("Server: %s\n", buff);
|
||||||
|
|
||||||
|
/* Bidirectional shutdown */
|
||||||
|
while (wolfSSL_shutdown(ssl) == SSL_SHUTDOWN_NOT_DONE) {
|
||||||
|
printf("Shutdown not complete\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("Shutdown complete\n");
|
||||||
|
|
||||||
|
ret = 0;
|
||||||
|
|
||||||
|
/* Cleanup and return */
|
||||||
|
cleanup:
|
||||||
|
wolfSSL_free(ssl); /* Free the wolfSSL object */
|
||||||
|
ctx_cleanup:
|
||||||
|
wolfSSL_CTX_free(ctx); /* Free the wolfSSL context object */
|
||||||
|
wolfSSL_Cleanup(); /* Cleanup the wolfSSL environment */
|
||||||
|
socket_cleanup:
|
||||||
|
close(sockfd); /* Close the connection to the server */
|
||||||
|
end:
|
||||||
|
return ret; /* Return reporting a success */
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
int main(void)
|
||||||
|
{
|
||||||
|
printf("Please build wolfssl with ./configure --enable-ech\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,238 @@
|
||||||
|
/* server-ech-local.c
|
||||||
|
*
|
||||||
|
* Copyright (C) 2023 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
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* the usual suspects */
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
/* socket includes */
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
/* wolfSSL */
|
||||||
|
#include <wolfssl/options.h>
|
||||||
|
#include <wolfssl/ssl.h>
|
||||||
|
|
||||||
|
#define DEFAULT_PORT 11111
|
||||||
|
|
||||||
|
#define CERT_FILE "../certs/server-cert.pem"
|
||||||
|
#define KEY_FILE "../certs/server-key.pem"
|
||||||
|
|
||||||
|
#ifdef HAVE_ECH
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
int sockfd = SOCKET_INVALID;
|
||||||
|
int connd = SOCKET_INVALID;
|
||||||
|
struct sockaddr_in servAddr;
|
||||||
|
struct sockaddr_in clientAddr;
|
||||||
|
socklen_t size = sizeof(clientAddr);
|
||||||
|
char buff[256];
|
||||||
|
size_t len;
|
||||||
|
int shutdown = 0;
|
||||||
|
int ret;
|
||||||
|
const char* reply = "I hear ya fa shizzle!\n";
|
||||||
|
const char* publicName = "ech-public-name.com";
|
||||||
|
const char* privateName = "ech-private-name.com";
|
||||||
|
int privateNameLen = strlen(privateName);
|
||||||
|
char echConfig[512];
|
||||||
|
word32 echConfigLen = 512;
|
||||||
|
|
||||||
|
/* declare wolfSSL objects */
|
||||||
|
WOLFSSL_CTX* ctx = NULL;
|
||||||
|
WOLFSSL* ssl = NULL;
|
||||||
|
|
||||||
|
/* Initialize wolfSSL */
|
||||||
|
wolfSSL_Init();
|
||||||
|
|
||||||
|
/* Create a socket that uses an internet IPv4 address,
|
||||||
|
* Sets the socket to be stream based (TCP),
|
||||||
|
* 0 means choose the default protocol. */
|
||||||
|
if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
|
||||||
|
fprintf(stderr, "ERROR: failed to create the socket\n");
|
||||||
|
ret = -1;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Create and initialize WOLFSSL_CTX */
|
||||||
|
if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_server_method())) == NULL) {
|
||||||
|
fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
|
||||||
|
ret = -1;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Generate ech config */
|
||||||
|
if (wolfSSL_CTX_GenerateEchConfig(ctx, publicName, 0, 0, 0)
|
||||||
|
!= WOLFSSL_SUCCESS) {
|
||||||
|
fprintf(stderr, "ERROR: failed to wolfSSL_CTX_GenerateEchConfig\n");
|
||||||
|
ret = -1;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(wolfSSL_CTX_GetEchConfigsBase64(ctx, (byte*)echConfig, &echConfigLen) !=
|
||||||
|
WOLFSSL_SUCCESS) {
|
||||||
|
fprintf(stderr, "ERROR: failed to wolfSSL_CTX_GetEchConfigsBase64\n");
|
||||||
|
ret = -1;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
fprintf(stdout, "ECH config: %s\n", echConfig);
|
||||||
|
|
||||||
|
if(wolfSSL_CTX_UseSNI(ctx, WOLFSSL_SNI_HOST_NAME, privateName,
|
||||||
|
privateNameLen) != WOLFSSL_SUCCESS) {
|
||||||
|
fprintf(stderr,
|
||||||
|
"ERROR: failed to wolfSSL_CTX_UseSNIwolfSSL_CTX_UseSNI\n");
|
||||||
|
ret = -1;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Load server certificates into WOLFSSL_CTX */
|
||||||
|
if ((ret = wolfSSL_CTX_use_certificate_file(ctx, CERT_FILE, SSL_FILETYPE_PEM))
|
||||||
|
!= WOLFSSL_SUCCESS) {
|
||||||
|
fprintf(stderr, "ERROR: failed to load %s, please check the file.\n",
|
||||||
|
CERT_FILE);
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Load server key into WOLFSSL_CTX */
|
||||||
|
if ((ret = wolfSSL_CTX_use_PrivateKey_file(ctx, KEY_FILE, SSL_FILETYPE_PEM))
|
||||||
|
!= WOLFSSL_SUCCESS) {
|
||||||
|
fprintf(stderr, "ERROR: failed to load %s, please check the file.\n",
|
||||||
|
KEY_FILE);
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Initialize the server address struct with zeros */
|
||||||
|
memset(&servAddr, 0, sizeof(servAddr));
|
||||||
|
|
||||||
|
/* Fill in the server address */
|
||||||
|
servAddr.sin_family = AF_INET; /* using IPv4 */
|
||||||
|
servAddr.sin_port = htons(DEFAULT_PORT); /* on DEFAULT_PORT */
|
||||||
|
servAddr.sin_addr.s_addr = INADDR_ANY; /* from anywhere */
|
||||||
|
|
||||||
|
/* Bind the server socket to our port */
|
||||||
|
if (bind(sockfd, (struct sockaddr*)&servAddr, sizeof(servAddr)) == -1) {
|
||||||
|
fprintf(stderr, "ERROR: failed to bind\n");
|
||||||
|
ret = -1;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Listen for a new connection, allow 5 pending connections */
|
||||||
|
if (listen(sockfd, 5) == -1) {
|
||||||
|
fprintf(stderr, "ERROR: failed to listen\n");
|
||||||
|
ret = -1;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Continue to accept clients until shutdown is issued */
|
||||||
|
while (!shutdown) {
|
||||||
|
printf("Waiting for a connection...\n");
|
||||||
|
|
||||||
|
/* Accept client connections */
|
||||||
|
if ((connd = accept(sockfd, (struct sockaddr*)&clientAddr, &size))
|
||||||
|
== -1) {
|
||||||
|
fprintf(stderr, "ERROR: failed to accept the connection\n\n");
|
||||||
|
ret = -1;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Create a WOLFSSL object */
|
||||||
|
if ((ssl = wolfSSL_new(ctx)) == NULL) {
|
||||||
|
fprintf(stderr, "ERROR: failed to create WOLFSSL object\n");
|
||||||
|
ret = -1;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Attach wolfSSL to the socket */
|
||||||
|
wolfSSL_set_fd(ssl, connd);
|
||||||
|
|
||||||
|
/* Establish TLS connection */
|
||||||
|
ret = wolfSSL_accept(ssl);
|
||||||
|
if (ret != WOLFSSL_SUCCESS) {
|
||||||
|
fprintf(stderr, "wolfSSL_accept error = %d\n",
|
||||||
|
wolfSSL_get_error(ssl, ret));
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("Client connected successfully\n");
|
||||||
|
|
||||||
|
/* Read the client data into our buff array */
|
||||||
|
memset(buff, 0, sizeof(buff));
|
||||||
|
if ((ret = wolfSSL_read(ssl, buff, sizeof(buff)-1)) == -1) {
|
||||||
|
fprintf(stderr, "ERROR: failed to read\n");
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Print to stdout any data the client sends */
|
||||||
|
printf("Client: %s\n", buff);
|
||||||
|
|
||||||
|
/* Check for server shutdown command */
|
||||||
|
if (strncmp(buff, "shutdown", 8) == 0) {
|
||||||
|
printf("Shutdown command issued!\n");
|
||||||
|
shutdown = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Write our reply into buff */
|
||||||
|
memset(buff, 0, sizeof(buff));
|
||||||
|
memcpy(buff, reply, strlen(reply));
|
||||||
|
len = strnlen(buff, sizeof(buff));
|
||||||
|
|
||||||
|
/* Reply back to the client */
|
||||||
|
if ((ret = wolfSSL_write(ssl, buff, len)) != len) {
|
||||||
|
fprintf(stderr, "ERROR: failed to write\n");
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Notify the client that the connection is ending */
|
||||||
|
wolfSSL_shutdown(ssl);
|
||||||
|
printf("Shutdown complete\n");
|
||||||
|
|
||||||
|
/* Cleanup after this connection */
|
||||||
|
wolfSSL_free(ssl); /* Free the wolfSSL object */
|
||||||
|
ssl = NULL;
|
||||||
|
close(connd); /* Close the connection to the client */
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = 0;
|
||||||
|
|
||||||
|
exit:
|
||||||
|
/* Cleanup and return */
|
||||||
|
if (ssl)
|
||||||
|
wolfSSL_free(ssl); /* Free the wolfSSL object */
|
||||||
|
if (connd != SOCKET_INVALID)
|
||||||
|
close(connd); /* Close the connection to the client */
|
||||||
|
if (sockfd != SOCKET_INVALID)
|
||||||
|
close(sockfd); /* Close the socket listening for clients */
|
||||||
|
if (ctx)
|
||||||
|
wolfSSL_CTX_free(ctx); /* Free the wolfSSL context object */
|
||||||
|
wolfSSL_Cleanup(); /* Cleanup the wolfSSL environment */
|
||||||
|
|
||||||
|
return ret; /* Return reporting a success */
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
int main(void)
|
||||||
|
{
|
||||||
|
printf("Please build wolfssl with ./configure --enable-ech\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
Loading…
Reference in New Issue