2011-07-26 13:27:22 -07:00
|
|
|
|
/* client.c
|
|
|
|
|
|
*
|
2022-12-30 17:12:11 -07:00
|
|
|
|
* Copyright (C) 2006-2023 wolfSSL Inc.
|
2011-07-26 13:27:22 -07:00
|
|
|
|
*
|
2016-03-17 16:02:13 -06:00
|
|
|
|
* This file is part of wolfSSL.
|
2011-07-26 13:27:22 -07:00
|
|
|
|
*
|
2015-01-05 14:48:43 -07:00
|
|
|
|
* wolfSSL is free software; you can redistribute it and/or modify
|
2011-07-26 13:27:22 -07:00
|
|
|
|
* 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.
|
|
|
|
|
|
*
|
2015-01-05 14:48:43 -07:00
|
|
|
|
* wolfSSL is distributed in the hope that it will be useful,
|
2011-07-26 13:27:22 -07:00
|
|
|
|
* 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
|
2016-03-17 16:02:13 -06:00
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
|
2011-07-26 13:27:22 -07:00
|
|
|
|
*/
|
|
|
|
|
|
|
2021-08-02 20:27:41 -06:00
|
|
|
|
/* For simpler wolfSSL TLS client examples, visit
|
2021-11-05 18:16:08 -05:00
|
|
|
|
* https://github.com/wolfSSL/wolfssl-examples/tree/master/tls
|
2021-08-02 20:27:41 -06:00
|
|
|
|
*/
|
|
|
|
|
|
|
2011-08-24 16:37:16 -07:00
|
|
|
|
#ifdef HAVE_CONFIG_H
|
2022-03-29 16:36:14 -07:00
|
|
|
|
#include <config.h>
|
2011-08-24 16:37:16 -07:00
|
|
|
|
#endif
|
2014-04-11 16:20:12 +09:00
|
|
|
|
|
2020-10-23 15:27:10 -05:00
|
|
|
|
#ifndef WOLFSSL_USER_SETTINGS
|
2022-03-29 16:36:14 -07:00
|
|
|
|
#include <wolfssl/options.h>
|
2020-10-23 15:27:10 -05:00
|
|
|
|
#endif
|
2017-12-28 07:20:03 +09:00
|
|
|
|
#include <wolfssl/wolfcrypt/settings.h>
|
|
|
|
|
|
|
2015-01-08 10:02:07 -07:00
|
|
|
|
#include <wolfssl/ssl.h>
|
2014-12-19 15:30:07 -07:00
|
|
|
|
|
2021-06-16 00:26:48 -05:00
|
|
|
|
#ifdef WOLFSSL_WOLFSENTRY_HOOKS
|
2021-06-17 20:02:34 -05:00
|
|
|
|
#include <wolfsentry/wolfsentry.h>
|
2021-06-16 00:26:48 -05:00
|
|
|
|
#if !defined(NO_FILESYSTEM) && !defined(WOLFSENTRY_NO_JSON)
|
|
|
|
|
|
static const char *wolfsentry_config_path = NULL;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#endif /* WOLFSSL_WOLFSENTRY_HOOKS */
|
|
|
|
|
|
|
2015-11-27 11:31:12 +09:00
|
|
|
|
#if defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET)
|
2022-03-29 16:36:14 -07:00
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
#include "rl_fs.h"
|
|
|
|
|
|
#include "rl_net.h"
|
2013-05-19 10:02:13 +09:00
|
|
|
|
#endif
|
2011-08-04 16:42:55 -06:00
|
|
|
|
|
2015-01-05 14:48:43 -07:00
|
|
|
|
#include <wolfssl/test.h>
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2017-09-25 18:47:36 -07:00
|
|
|
|
#include <examples/client/client.h>
|
2018-03-16 12:02:36 -07:00
|
|
|
|
#include <wolfssl/error-ssl.h>
|
2012-09-19 23:38:41 -07:00
|
|
|
|
|
2017-06-26 23:05:32 -07:00
|
|
|
|
#ifndef NO_WOLFSSL_CLIENT
|
|
|
|
|
|
|
2020-10-09 09:45:00 -07:00
|
|
|
|
#ifdef NO_FILESYSTEM
|
|
|
|
|
|
#ifdef NO_RSA
|
|
|
|
|
|
#error currently the example only tries to load in a RSA buffer
|
|
|
|
|
|
#endif
|
2020-10-13 09:26:54 -06:00
|
|
|
|
#undef USE_CERT_BUFFERS_256
|
|
|
|
|
|
#define USE_CERT_BUFFERS_256
|
2020-10-09 09:45:00 -07:00
|
|
|
|
#undef USE_CERT_BUFFERS_2048
|
|
|
|
|
|
#define USE_CERT_BUFFERS_2048
|
|
|
|
|
|
#include <wolfssl/certs_test.h>
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2023-02-28 13:15:07 -08:00
|
|
|
|
#include <wolfssl/wolfcrypt/wolfmath.h> /* for max bits */
|
|
|
|
|
|
|
2019-03-01 16:12:08 -08:00
|
|
|
|
#ifdef HAVE_ECC
|
|
|
|
|
|
#include <wolfssl/wolfcrypt/ecc.h>
|
|
|
|
|
|
#endif
|
2018-08-17 11:06:40 -06:00
|
|
|
|
|
2017-04-10 14:19:20 -07:00
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
2016-08-15 13:59:41 -06:00
|
|
|
|
static int devId = INVALID_DEVID;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2017-03-06 09:49:05 -08:00
|
|
|
|
#define DEFAULT_TIMEOUT_SEC 2
|
2019-01-11 08:45:34 -08:00
|
|
|
|
#ifndef MAX_NON_BLOCK_SEC
|
|
|
|
|
|
#define MAX_NON_BLOCK_SEC 10
|
|
|
|
|
|
#endif
|
2017-03-06 09:49:05 -08:00
|
|
|
|
|
2018-08-02 16:25:38 -07:00
|
|
|
|
#define OCSP_STAPLING 1
|
|
|
|
|
|
#define OCSP_STAPLINGV2 2
|
|
|
|
|
|
#define OCSP_STAPLINGV2_MULTI 3
|
|
|
|
|
|
#define OCSP_STAPLING_OPT_MAX OCSP_STAPLINGV2_MULTI
|
|
|
|
|
|
|
2020-07-22 12:15:14 -07:00
|
|
|
|
#ifdef WOLFSSL_ALT_TEST_STRINGS
|
|
|
|
|
|
#define TEST_STR_TERM "\n"
|
2020-07-21 13:34:25 -07:00
|
|
|
|
#else
|
2020-07-22 12:15:14 -07:00
|
|
|
|
#define TEST_STR_TERM
|
2020-07-21 13:34:25 -07:00
|
|
|
|
#endif
|
2020-07-22 12:15:14 -07:00
|
|
|
|
|
|
|
|
|
|
static const char kHelloMsg[] = "hello wolfssl!" TEST_STR_TERM;
|
|
|
|
|
|
#ifndef NO_SESSION_CACHE
|
|
|
|
|
|
static const char kResumeMsg[] = "resuming wolfssl!" TEST_STR_TERM;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2020-07-21 13:34:25 -07:00
|
|
|
|
#if defined(WOLFSSL_TLS13) && defined(WOLFSSL_EARLY_DATA)
|
2020-07-22 12:15:14 -07:00
|
|
|
|
static const char kEarlyMsg[] = "A drop of info" TEST_STR_TERM;
|
2020-07-21 13:34:25 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
static const char kHttpGetMsg[] = "GET /index.html HTTP/1.0\r\n\r\n";
|
|
|
|
|
|
|
|
|
|
|
|
/* Write needs to be largest of the above strings (29) */
|
|
|
|
|
|
#define CLI_MSG_SZ 32
|
|
|
|
|
|
/* Read needs to be at least sizeof server.c `webServerMsg` (226) */
|
|
|
|
|
|
#define CLI_REPLY_SZ 256
|
|
|
|
|
|
|
2020-07-29 16:51:08 -07:00
|
|
|
|
#if defined(XSLEEP_US) && defined(NO_MAIN_DRIVER)
|
2020-07-22 13:08:57 -07:00
|
|
|
|
/* This is to force the server's thread to get a chance to
|
|
|
|
|
|
* execute before continuing the resume in non-blocking
|
|
|
|
|
|
* DTLS test cases. */
|
|
|
|
|
|
#define TEST_DELAY() XSLEEP_US(10000)
|
|
|
|
|
|
#else
|
|
|
|
|
|
#define TEST_DELAY() XSLEEP_MS(1000)
|
|
|
|
|
|
#endif
|
2020-07-21 13:34:25 -07:00
|
|
|
|
|
2015-12-24 15:42:52 -08:00
|
|
|
|
/* Note on using port 0: the client standalone example doesn't utilize the
|
|
|
|
|
|
* port 0 port sharing; that is used by (1) the server in external control
|
|
|
|
|
|
* test mode and (2) the testsuite which uses this code and sets up the correct
|
|
|
|
|
|
* port numbers when the internal thread using the server code using port 0. */
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2018-10-20 13:40:01 +09:00
|
|
|
|
static int lng_index = 0;
|
2015-01-05 14:48:43 -07:00
|
|
|
|
#ifdef WOLFSSL_CALLBACKS
|
2020-04-08 09:46:22 +10:00
|
|
|
|
WOLFSSL_TIMEVAL timeoutConnect;
|
2017-06-26 23:05:32 -07:00
|
|
|
|
static int handShakeCB(HandShakeInfo* info)
|
|
|
|
|
|
{
|
|
|
|
|
|
(void)info;
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int timeoutCB(TimeoutInfo* info)
|
|
|
|
|
|
{
|
|
|
|
|
|
(void)info;
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2011-02-05 11:14:47 -08:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2014-10-20 09:25:14 -07:00
|
|
|
|
#ifdef HAVE_SESSION_TICKET
|
2022-05-20 10:00:24 +02:00
|
|
|
|
|
|
|
|
|
|
#ifndef SESSION_TICKET_LEN
|
|
|
|
|
|
#define SESSION_TICKET_LEN 256
|
|
|
|
|
|
#endif
|
2017-06-26 23:05:32 -07:00
|
|
|
|
static int sessionTicketCB(WOLFSSL* ssl,
|
|
|
|
|
|
const unsigned char* ticket, int ticketSz,
|
|
|
|
|
|
void* ctx)
|
|
|
|
|
|
{
|
|
|
|
|
|
(void)ssl;
|
|
|
|
|
|
(void)ticket;
|
|
|
|
|
|
printf("Session Ticket CB: ticketSz = %d, ctx = %s\n",
|
|
|
|
|
|
ticketSz, (char*)ctx);
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
2014-10-20 09:25:14 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
static int NonBlockingSSL_Connect(WOLFSSL* ssl)
|
2012-10-17 13:13:58 -07:00
|
|
|
|
{
|
2017-06-08 10:32:51 +10:00
|
|
|
|
int ret;
|
|
|
|
|
|
int error;
|
|
|
|
|
|
SOCKET_T sockfd;
|
|
|
|
|
|
int select_ret = 0;
|
2019-01-10 17:12:37 -08:00
|
|
|
|
int elapsedSec = 0;
|
2017-06-08 10:32:51 +10:00
|
|
|
|
|
2015-01-05 14:48:43 -07:00
|
|
|
|
#ifndef WOLFSSL_CALLBACKS
|
2017-06-08 10:32:51 +10:00
|
|
|
|
ret = wolfSSL_connect(ssl);
|
2011-02-05 11:14:47 -08:00
|
|
|
|
#else
|
2020-04-08 09:46:22 +10:00
|
|
|
|
ret = wolfSSL_connect_ex(ssl, handShakeCB, timeoutCB, timeoutConnect);
|
2011-02-05 11:14:47 -08:00
|
|
|
|
#endif
|
2017-06-08 10:32:51 +10:00
|
|
|
|
error = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
sockfd = (SOCKET_T)wolfSSL_get_fd(ssl);
|
2012-10-17 13:13:58 -07:00
|
|
|
|
|
2018-03-16 12:02:36 -07:00
|
|
|
|
while (ret != WOLFSSL_SUCCESS &&
|
|
|
|
|
|
(error == WOLFSSL_ERROR_WANT_READ || error == WOLFSSL_ERROR_WANT_WRITE
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
|| error == WC_PENDING_E
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef WOLFSSL_NONBLOCK_OCSP
|
|
|
|
|
|
|| error == OCSP_WANT_READ
|
|
|
|
|
|
#endif
|
|
|
|
|
|
)) {
|
2013-05-08 12:49:55 -07:00
|
|
|
|
int currTimeout = 1;
|
2018-03-16 12:02:36 -07:00
|
|
|
|
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (error == WOLFSSL_ERROR_WANT_READ)
|
2012-10-17 13:13:58 -07:00
|
|
|
|
printf("... client would read block\n");
|
2017-10-11 09:09:52 -07:00
|
|
|
|
else if (error == WOLFSSL_ERROR_WANT_WRITE)
|
2012-10-17 13:13:58 -07:00
|
|
|
|
printf("... client would write block\n");
|
2018-03-16 12:02:36 -07:00
|
|
|
|
|
2016-03-04 10:05:22 -08:00
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
2018-03-16 12:02:36 -07:00
|
|
|
|
if (error == WC_PENDING_E) {
|
2016-08-15 13:59:41 -06:00
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
if (ret < 0) break;
|
2016-03-04 10:05:22 -08:00
|
|
|
|
}
|
2018-03-16 12:02:36 -07:00
|
|
|
|
else
|
2016-03-04 10:05:22 -08:00
|
|
|
|
#endif
|
2018-03-16 12:02:36 -07:00
|
|
|
|
{
|
2020-11-02 08:23:36 -06:00
|
|
|
|
if (error == WOLFSSL_ERROR_WANT_WRITE) {
|
|
|
|
|
|
select_ret = tcp_select_tx(sockfd, currTimeout);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
2018-12-14 11:30:03 -08:00
|
|
|
|
#ifdef WOLFSSL_DTLS
|
2022-05-12 16:48:04 +02:00
|
|
|
|
if (wolfSSL_dtls(ssl))
|
|
|
|
|
|
currTimeout = wolfSSL_dtls_get_current_timeout(ssl);
|
2018-12-14 11:30:03 -08:00
|
|
|
|
#endif
|
|
|
|
|
|
select_ret = tcp_select(sockfd, currTimeout);
|
|
|
|
|
|
}
|
2016-08-15 13:59:41 -06:00
|
|
|
|
}
|
2012-10-17 13:13:58 -07:00
|
|
|
|
|
2018-12-14 11:30:03 -08:00
|
|
|
|
if ((select_ret == TEST_RECV_READY) || (select_ret == TEST_SEND_READY)
|
|
|
|
|
|
|| (select_ret == TEST_ERROR_READY)
|
2018-03-16 12:02:36 -07:00
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
|| error == WC_PENDING_E
|
|
|
|
|
|
#endif
|
|
|
|
|
|
) {
|
2016-03-04 10:05:22 -08:00
|
|
|
|
#ifndef WOLFSSL_CALLBACKS
|
|
|
|
|
|
ret = wolfSSL_connect(ssl);
|
|
|
|
|
|
#else
|
2020-04-08 09:46:22 +10:00
|
|
|
|
ret = wolfSSL_connect_ex(ssl, handShakeCB, timeoutCB,
|
|
|
|
|
|
timeoutConnect);
|
2016-03-04 10:05:22 -08:00
|
|
|
|
#endif
|
2015-01-05 14:48:43 -07:00
|
|
|
|
error = wolfSSL_get_error(ssl, 0);
|
2019-01-10 17:12:37 -08:00
|
|
|
|
elapsedSec = 0; /* reset elapsed */
|
2012-10-17 13:13:58 -07:00
|
|
|
|
}
|
2015-01-05 14:48:43 -07:00
|
|
|
|
else if (select_ret == TEST_TIMEOUT && !wolfSSL_dtls(ssl)) {
|
2017-10-11 09:09:52 -07:00
|
|
|
|
error = WOLFSSL_ERROR_WANT_READ;
|
2019-01-10 17:12:37 -08:00
|
|
|
|
|
|
|
|
|
|
elapsedSec += currTimeout;
|
2019-01-11 08:45:34 -08:00
|
|
|
|
if (elapsedSec > MAX_NON_BLOCK_SEC) {
|
|
|
|
|
|
printf("Nonblocking connect timeout\n");
|
2019-01-10 17:12:37 -08:00
|
|
|
|
error = WOLFSSL_FATAL_ERROR;
|
|
|
|
|
|
}
|
2012-10-17 13:13:58 -07:00
|
|
|
|
}
|
2015-01-05 14:48:43 -07:00
|
|
|
|
#ifdef WOLFSSL_DTLS
|
2022-04-26 15:51:50 +02:00
|
|
|
|
else if (select_ret == TEST_TIMEOUT && wolfSSL_dtls(ssl)) {
|
|
|
|
|
|
ret = wolfSSL_dtls_got_timeout(ssl);
|
|
|
|
|
|
if (ret != WOLFSSL_SUCCESS)
|
|
|
|
|
|
error = wolfSSL_get_error(ssl, ret);
|
|
|
|
|
|
else
|
|
|
|
|
|
error = WOLFSSL_ERROR_WANT_READ;
|
2022-05-12 16:48:04 +02:00
|
|
|
|
ret = WOLFSSL_FAILURE; /* Reset error so we loop */
|
2013-05-08 12:49:55 -07:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2012-10-17 13:13:58 -07:00
|
|
|
|
else {
|
2017-10-11 09:09:52 -07:00
|
|
|
|
error = WOLFSSL_FATAL_ERROR;
|
2011-02-05 11:14:47 -08:00
|
|
|
|
}
|
|
|
|
|
|
}
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
|
|
|
|
|
|
return ret;
|
2012-10-17 13:13:58 -07:00
|
|
|
|
}
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
|
|
|
|
|
|
2015-10-02 16:25:17 -07:00
|
|
|
|
static void ShowCiphers(void)
|
|
|
|
|
|
{
|
2019-04-22 16:30:38 -07:00
|
|
|
|
static char ciphers[WOLFSSL_CIPHER_LIST_MAX_SIZE];
|
2015-10-02 16:25:17 -07:00
|
|
|
|
int ret = wolfSSL_get_ciphers(ciphers, (int)sizeof(ciphers));
|
2021-10-19 13:00:25 -07:00
|
|
|
|
if (ret == WOLFSSL_SUCCESS) {
|
2015-10-02 16:25:17 -07:00
|
|
|
|
printf("%s\n", ciphers);
|
2021-10-19 13:00:25 -07:00
|
|
|
|
}
|
2015-10-02 16:25:17 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
2015-11-02 13:26:46 -08:00
|
|
|
|
/* Shows which versions are valid */
|
|
|
|
|
|
static void ShowVersions(void)
|
|
|
|
|
|
{
|
2021-10-19 13:00:25 -07:00
|
|
|
|
char verStr[100];
|
|
|
|
|
|
XMEMSET(verStr, 0, sizeof(verStr));
|
2015-12-23 12:12:41 -08:00
|
|
|
|
#ifndef NO_OLD_TLS
|
2017-11-14 13:55:48 -08:00
|
|
|
|
#ifdef WOLFSSL_ALLOW_SSLV3
|
2021-10-19 13:00:25 -07:00
|
|
|
|
XSTRNCAT(verStr, "0:", 3);
|
2017-11-14 13:55:48 -08:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef WOLFSSL_ALLOW_TLSV10
|
2021-10-19 13:00:25 -07:00
|
|
|
|
XSTRNCAT(verStr, "1:", 3);
|
2017-11-14 13:55:48 -08:00
|
|
|
|
#endif
|
2021-10-19 13:00:25 -07:00
|
|
|
|
XSTRNCAT(verStr, "2:", 3);
|
2015-12-23 12:12:41 -08:00
|
|
|
|
#endif /* NO_OLD_TLS */
|
2018-05-17 09:08:03 +10:00
|
|
|
|
#ifndef WOLFSSL_NO_TLS12
|
2021-10-19 13:00:25 -07:00
|
|
|
|
XSTRNCAT(verStr, "3:", 3);
|
2018-05-17 09:08:03 +10:00
|
|
|
|
#endif
|
2017-11-14 13:55:48 -08:00
|
|
|
|
#ifdef WOLFSSL_TLS13
|
2021-10-19 13:00:25 -07:00
|
|
|
|
XSTRNCAT(verStr, "4:", 3);
|
2018-10-04 14:48:53 -07:00
|
|
|
|
#endif
|
2021-10-19 13:00:25 -07:00
|
|
|
|
XSTRNCAT(verStr, "d(downgrade):", 14);
|
2018-10-04 14:48:53 -07:00
|
|
|
|
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_EITHER_SIDE)
|
2021-10-19 13:00:25 -07:00
|
|
|
|
XSTRNCAT(verStr, "e(either):", 11);
|
2017-11-14 13:55:48 -08:00
|
|
|
|
#endif
|
2021-10-19 13:00:25 -07:00
|
|
|
|
/* print all stings at same time on stdout to avoid any flush issues */
|
|
|
|
|
|
printf("%s\n", verStr);
|
2015-11-02 13:26:46 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#if defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES)
|
2020-07-17 10:26:34 -06:00
|
|
|
|
#define MAX_GROUP_NUMBER 4
|
2020-02-19 18:07:45 +10:00
|
|
|
|
static void SetKeyShare(WOLFSSL* ssl, int onlyKeyShare, int useX25519,
|
2021-12-20 11:26:25 -05:00
|
|
|
|
int useX448, int usePqc, char* pqcAlg, int setGroups)
|
2018-04-13 11:53:42 +10:00
|
|
|
|
{
|
2021-06-08 12:15:42 -07:00
|
|
|
|
int ret;
|
2020-07-17 10:26:34 -06:00
|
|
|
|
int groups[MAX_GROUP_NUMBER] = {0};
|
2018-05-01 14:27:38 +10:00
|
|
|
|
int count = 0;
|
|
|
|
|
|
|
2018-04-13 11:53:42 +10:00
|
|
|
|
(void)useX25519;
|
2020-02-19 18:07:45 +10:00
|
|
|
|
(void)useX448;
|
2021-12-20 11:26:25 -05:00
|
|
|
|
(void)usePqc;
|
|
|
|
|
|
(void)pqcAlg;
|
2018-04-13 11:53:42 +10:00
|
|
|
|
|
|
|
|
|
|
WOLFSSL_START(WC_FUNC_CLIENT_KEY_EXCHANGE_SEND);
|
|
|
|
|
|
if (onlyKeyShare == 0 || onlyKeyShare == 2) {
|
|
|
|
|
|
if (useX25519) {
|
2021-06-08 12:15:42 -07:00
|
|
|
|
#ifdef HAVE_CURVE25519
|
|
|
|
|
|
do {
|
|
|
|
|
|
ret = wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_X25519);
|
|
|
|
|
|
if (ret == WOLFSSL_SUCCESS)
|
|
|
|
|
|
groups[count++] = WOLFSSL_ECC_X25519;
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
else if (ret == WC_PENDING_E)
|
|
|
|
|
|
wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
else
|
|
|
|
|
|
err_sys("unable to use curve x25519");
|
|
|
|
|
|
} while (ret == WC_PENDING_E);
|
2020-02-19 18:07:45 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
}
|
2021-06-08 12:15:42 -07:00
|
|
|
|
else if (useX448) {
|
|
|
|
|
|
#ifdef HAVE_CURVE448
|
|
|
|
|
|
do {
|
|
|
|
|
|
ret = wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_X448);
|
|
|
|
|
|
if (ret == WOLFSSL_SUCCESS)
|
|
|
|
|
|
groups[count++] = WOLFSSL_ECC_X448;
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
else if (ret == WC_PENDING_E)
|
|
|
|
|
|
wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
else
|
|
|
|
|
|
err_sys("unable to use curve x448");
|
|
|
|
|
|
} while (ret == WC_PENDING_E);
|
2018-04-13 11:53:42 +10:00
|
|
|
|
#endif
|
2021-06-08 12:15:42 -07:00
|
|
|
|
}
|
|
|
|
|
|
else {
|
2018-04-13 11:53:42 +10:00
|
|
|
|
#ifdef HAVE_ECC
|
2019-07-24 10:35:33 -07:00
|
|
|
|
#if !defined(NO_ECC256) || defined(HAVE_ALL_CURVES)
|
2021-06-08 12:15:42 -07:00
|
|
|
|
do {
|
|
|
|
|
|
ret = wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_SECP256R1);
|
|
|
|
|
|
if (ret == WOLFSSL_SUCCESS)
|
|
|
|
|
|
groups[count++] = WOLFSSL_ECC_SECP256R1;
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
else if (ret == WC_PENDING_E)
|
|
|
|
|
|
wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
else
|
|
|
|
|
|
err_sys("unable to use curve secp256r1");
|
|
|
|
|
|
} while (ret == WC_PENDING_E);
|
2018-04-13 11:53:42 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
if (onlyKeyShare == 0 || onlyKeyShare == 1) {
|
|
|
|
|
|
#ifdef HAVE_FFDHE_2048
|
2021-06-08 12:15:42 -07:00
|
|
|
|
do {
|
|
|
|
|
|
ret = wolfSSL_UseKeyShare(ssl, WOLFSSL_FFDHE_2048);
|
|
|
|
|
|
if (ret == WOLFSSL_SUCCESS)
|
|
|
|
|
|
groups[count++] = WOLFSSL_FFDHE_2048;
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
else if (ret == WC_PENDING_E)
|
|
|
|
|
|
wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
else
|
|
|
|
|
|
err_sys("unable to use DH 2048-bit parameters");
|
|
|
|
|
|
} while (ret == WC_PENDING_E);
|
2018-04-13 11:53:42 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
}
|
2021-12-20 11:26:25 -05:00
|
|
|
|
#ifdef HAVE_PQC
|
2021-04-28 10:28:35 -07:00
|
|
|
|
if (onlyKeyShare == 0 || onlyKeyShare == 3) {
|
2021-12-20 11:26:25 -05:00
|
|
|
|
if (usePqc) {
|
2021-04-28 10:28:35 -07:00
|
|
|
|
int group = 0;
|
|
|
|
|
|
|
2022-05-10 12:20:12 -05:00
|
|
|
|
if (XSTRCMP(pqcAlg, "KYBER_LEVEL1") == 0) {
|
2021-09-17 13:21:39 -04:00
|
|
|
|
group = WOLFSSL_KYBER_LEVEL1;
|
2021-04-28 10:28:35 -07:00
|
|
|
|
}
|
2022-05-10 12:20:12 -05:00
|
|
|
|
else if (XSTRCMP(pqcAlg, "KYBER_LEVEL3") == 0) {
|
2021-09-17 13:21:39 -04:00
|
|
|
|
group = WOLFSSL_KYBER_LEVEL3;
|
2021-04-28 10:28:35 -07:00
|
|
|
|
}
|
2022-05-10 12:20:12 -05:00
|
|
|
|
else if (XSTRCMP(pqcAlg, "KYBER_LEVEL5") == 0) {
|
2021-09-17 13:21:39 -04:00
|
|
|
|
group = WOLFSSL_KYBER_LEVEL5;
|
2021-04-28 10:28:35 -07:00
|
|
|
|
}
|
2022-05-10 12:20:12 -05:00
|
|
|
|
else if (XSTRCMP(pqcAlg, "P256_KYBER_LEVEL1") == 0) {
|
2021-09-17 13:21:39 -04:00
|
|
|
|
group = WOLFSSL_P256_KYBER_LEVEL1;
|
2021-09-08 16:49:34 -04:00
|
|
|
|
}
|
2022-05-10 12:20:12 -05:00
|
|
|
|
else if (XSTRCMP(pqcAlg, "P384_KYBER_LEVEL3") == 0) {
|
2021-09-17 13:21:39 -04:00
|
|
|
|
group = WOLFSSL_P384_KYBER_LEVEL3;
|
2021-09-08 16:49:34 -04:00
|
|
|
|
}
|
2022-05-10 12:20:12 -05:00
|
|
|
|
else if (XSTRCMP(pqcAlg, "P521_KYBER_LEVEL5") == 0) {
|
2021-09-17 13:21:39 -04:00
|
|
|
|
group = WOLFSSL_P521_KYBER_LEVEL5;
|
2021-04-28 10:28:35 -07:00
|
|
|
|
} else {
|
2021-12-20 11:26:25 -05:00
|
|
|
|
err_sys("invalid post-quantum KEM specified");
|
2021-04-28 10:28:35 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
2021-12-20 11:26:25 -05:00
|
|
|
|
printf("Using Post-Quantum KEM: %s\n", pqcAlg);
|
2022-12-13 11:36:00 -05:00
|
|
|
|
if (wolfSSL_UseKeyShare(ssl, group) == WOLFSSL_SUCCESS) {
|
|
|
|
|
|
groups[count++] = group;
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
2021-12-20 11:26:25 -05:00
|
|
|
|
err_sys("unable to use post-quantum KEM");
|
2021-04-28 10:28:35 -07:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2020-07-17 10:26:34 -06:00
|
|
|
|
if (count >= MAX_GROUP_NUMBER)
|
|
|
|
|
|
err_sys("example group array size error");
|
2021-06-08 12:15:42 -07:00
|
|
|
|
if (setGroups && count > 0) {
|
|
|
|
|
|
if (wolfSSL_set_groups(ssl, groups, count) != WOLFSSL_SUCCESS)
|
|
|
|
|
|
err_sys("unable to set groups");
|
|
|
|
|
|
}
|
2018-04-13 11:53:42 +10:00
|
|
|
|
WOLFSSL_END(WC_FUNC_CLIENT_KEY_EXCHANGE_SEND);
|
|
|
|
|
|
}
|
2021-06-08 12:15:42 -07:00
|
|
|
|
#endif /* WOLFSSL_TLS13 && HAVE_SUPPORTED_CURVES */
|
2018-04-13 11:53:42 +10:00
|
|
|
|
|
2019-01-24 14:30:06 +10:00
|
|
|
|
#ifdef WOLFSSL_EARLY_DATA
|
|
|
|
|
|
static void EarlyData(WOLFSSL_CTX* ctx, WOLFSSL* ssl, const char* msg,
|
|
|
|
|
|
int msgSz, char* buffer)
|
|
|
|
|
|
{
|
|
|
|
|
|
int err;
|
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
|
err = 0; /* reset error */
|
|
|
|
|
|
ret = wolfSSL_write_early_data(ssl, msg, msgSz, &msgSz);
|
|
|
|
|
|
if (ret <= 0) {
|
|
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
} while (err == WC_PENDING_E);
|
|
|
|
|
|
if (ret != msgSz) {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "SSL_write_early_data msg error %d, %s\n", err,
|
2019-01-24 14:30:06 +10:00
|
|
|
|
wolfSSL_ERR_error_string(err, buffer));
|
|
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
err_sys("SSL_write_early_data failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
do {
|
|
|
|
|
|
err = 0; /* reset error */
|
|
|
|
|
|
ret = wolfSSL_write_early_data(ssl, msg, msgSz, &msgSz);
|
|
|
|
|
|
if (ret <= 0) {
|
|
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
} while (err == WC_PENDING_E);
|
|
|
|
|
|
if (ret != msgSz) {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "SSL_write_early_data msg error %d, %s\n", err,
|
2019-01-24 14:30:06 +10:00
|
|
|
|
wolfSSL_ERR_error_string(err, buffer));
|
2020-01-15 22:15:38 +10:00
|
|
|
|
wolfSSL_free(ssl);
|
|
|
|
|
|
wolfSSL_CTX_free(ctx);
|
2019-01-24 14:30:06 +10:00
|
|
|
|
err_sys("SSL_write_early_data failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2016-08-25 22:20:35 -07:00
|
|
|
|
/* Measures average time to create, connect and disconnect a connection (TPS).
|
|
|
|
|
|
Benchmark = number of connections. */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
static const char* client_bench_conmsg[][5] = {
|
|
|
|
|
|
/* English */
|
|
|
|
|
|
{
|
|
|
|
|
|
"wolfSSL_resume avg took:", "milliseconds\n",
|
|
|
|
|
|
"wolfSSL_connect avg took:", "milliseconds\n",
|
|
|
|
|
|
NULL
|
|
|
|
|
|
},
|
2018-11-29 07:04:01 +09:00
|
|
|
|
#ifndef NO_MULTIBYTE_PRINT
|
2018-10-20 13:40:01 +09:00
|
|
|
|
/* Japanese */
|
|
|
|
|
|
{
|
|
|
|
|
|
"wolfSSL_resume 平均時間:", "ミリ秒\n",
|
|
|
|
|
|
"wolfSSL_connect 平均時間:", "ミリ秒\n",
|
|
|
|
|
|
}
|
2018-11-26 08:11:31 +09:00
|
|
|
|
#endif
|
2018-10-20 13:40:01 +09:00
|
|
|
|
};
|
|
|
|
|
|
|
2016-08-25 22:20:35 -07:00
|
|
|
|
static int ClientBenchmarkConnections(WOLFSSL_CTX* ctx, char* host, word16 port,
|
2017-06-29 09:00:44 +10:00
|
|
|
|
int dtlsUDP, int dtlsSCTP, int benchmark, int resumeSession, int useX25519,
|
2021-12-20 11:26:25 -05:00
|
|
|
|
int useX448, int usePqc, char* pqcAlg, int helloRetry, int onlyKeyShare,
|
2021-04-28 10:28:35 -07:00
|
|
|
|
int version, int earlyData)
|
2015-10-14 19:13:45 -07:00
|
|
|
|
{
|
|
|
|
|
|
/* time passed in number of connects give average */
|
2022-06-03 11:06:46 -06:00
|
|
|
|
int times = benchmark, skip = (int)((double)times * 0.1);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
int loops = resumeSession ? 2 : 1;
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
int i = 0, err, ret;
|
2016-02-22 10:11:41 +01:00
|
|
|
|
#ifndef NO_SESSION_CACHE
|
2015-10-14 19:13:45 -07:00
|
|
|
|
WOLFSSL_SESSION* benchSession = NULL;
|
2016-02-22 10:11:41 +01:00
|
|
|
|
#endif
|
2016-11-24 01:31:07 +10:00
|
|
|
|
#ifdef WOLFSSL_TLS13
|
2020-07-21 13:34:25 -07:00
|
|
|
|
byte reply[CLI_REPLY_SZ];
|
2016-11-24 01:31:07 +10:00
|
|
|
|
#endif
|
2018-10-20 13:40:01 +09:00
|
|
|
|
const char** words = client_bench_conmsg[lng_index];
|
2016-11-24 01:31:07 +10:00
|
|
|
|
|
2016-02-22 10:11:41 +01:00
|
|
|
|
(void)resumeSession;
|
2017-05-31 11:44:43 +10:00
|
|
|
|
(void)useX25519;
|
2020-02-19 18:07:45 +10:00
|
|
|
|
(void)useX448;
|
2021-12-20 11:26:25 -05:00
|
|
|
|
(void)usePqc;
|
|
|
|
|
|
(void)pqcAlg;
|
2017-06-29 09:00:44 +10:00
|
|
|
|
(void)helloRetry;
|
2018-04-09 13:53:05 +10:00
|
|
|
|
(void)onlyKeyShare;
|
|
|
|
|
|
(void)version;
|
2019-01-24 14:30:06 +10:00
|
|
|
|
(void)earlyData;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
|
|
|
|
|
while (loops--) {
|
2016-02-22 10:11:41 +01:00
|
|
|
|
#ifndef NO_SESSION_CACHE
|
2015-10-14 19:13:45 -07:00
|
|
|
|
int benchResume = resumeSession && loops == 0;
|
2016-02-22 10:11:41 +01:00
|
|
|
|
#endif
|
2022-06-03 11:06:46 -06:00
|
|
|
|
double start = current_time(1), avg;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < times; i++) {
|
|
|
|
|
|
SOCKET_T sockfd;
|
2018-04-09 13:53:05 +10:00
|
|
|
|
WOLFSSL* ssl;
|
|
|
|
|
|
|
2022-06-03 11:06:46 -06:00
|
|
|
|
if (i == skip)
|
2018-04-09 13:53:05 +10:00
|
|
|
|
start = current_time(1);
|
|
|
|
|
|
|
|
|
|
|
|
ssl = wolfSSL_new(ctx);
|
2015-10-16 14:12:38 -07:00
|
|
|
|
if (ssl == NULL)
|
|
|
|
|
|
err_sys("unable to get SSL object");
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
2018-04-13 11:53:42 +10:00
|
|
|
|
#ifndef NO_SESSION_CACHE
|
|
|
|
|
|
if (benchResume)
|
|
|
|
|
|
wolfSSL_set_session(ssl, benchSession);
|
|
|
|
|
|
#endif
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#if defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES)
|
2018-04-13 11:53:42 +10:00
|
|
|
|
else if (version >= 4) {
|
|
|
|
|
|
if (!helloRetry)
|
2021-04-28 10:28:35 -07:00
|
|
|
|
SetKeyShare(ssl, onlyKeyShare, useX25519, useX448,
|
2021-12-20 11:26:25 -05:00
|
|
|
|
usePqc, pqcAlg, 1);
|
2018-04-13 11:53:42 +10:00
|
|
|
|
else
|
2018-04-09 13:53:05 +10:00
|
|
|
|
wolfSSL_NoKeyShares(ssl);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2016-11-24 01:31:07 +10:00
|
|
|
|
|
2016-08-25 22:20:35 -07:00
|
|
|
|
tcp_connect(&sockfd, host, port, dtlsUDP, dtlsSCTP, ssl);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_set_fd(ssl, sockfd) != WOLFSSL_SUCCESS) {
|
2016-03-25 13:59:04 -06:00
|
|
|
|
err_sys("error in setting fd");
|
|
|
|
|
|
}
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
|
2019-01-24 14:30:06 +10:00
|
|
|
|
#if defined(WOLFSSL_TLS13) && !defined(NO_SESSION_CACHE) && \
|
|
|
|
|
|
defined(WOLFSSL_EARLY_DATA)
|
|
|
|
|
|
if (version >= 4 && benchResume && earlyData) {
|
|
|
|
|
|
char buffer[WOLFSSL_MAX_ERROR_SZ];
|
2020-07-21 13:34:25 -07:00
|
|
|
|
EarlyData(ctx, ssl, kEarlyMsg, sizeof(kEarlyMsg)-1, buffer);
|
2019-01-24 14:30:06 +10:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
do {
|
|
|
|
|
|
err = 0; /* reset error */
|
|
|
|
|
|
ret = wolfSSL_connect(ssl);
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (ret != WOLFSSL_SUCCESS) {
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
2022-03-11 09:46:42 -08:00
|
|
|
|
/* returns the number of polled items or <0 for error */
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
} while (err == WC_PENDING_E);
|
2022-08-10 09:40:42 -07:00
|
|
|
|
#ifdef WOLFSSL_EARLY_DATA
|
|
|
|
|
|
EarlyDataStatus(ssl);
|
|
|
|
|
|
#endif
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (ret != WOLFSSL_SUCCESS) {
|
2015-10-14 19:13:45 -07:00
|
|
|
|
err_sys("SSL_connect failed");
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
}
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
2016-11-24 01:31:07 +10:00
|
|
|
|
#ifdef WOLFSSL_TLS13
|
2018-07-17 09:04:00 +10:00
|
|
|
|
#ifndef NO_SESSION_CACHE
|
|
|
|
|
|
if (version >= 4 && resumeSession && !benchResume)
|
|
|
|
|
|
#else
|
|
|
|
|
|
if (version >= 4 && resumeSession)
|
|
|
|
|
|
#endif
|
|
|
|
|
|
{
|
2020-07-21 13:34:25 -07:00
|
|
|
|
/* no null term */
|
|
|
|
|
|
if (wolfSSL_write(ssl, kHttpGetMsg, sizeof(kHttpGetMsg)-1) <= 0)
|
2016-11-24 01:31:07 +10:00
|
|
|
|
err_sys("SSL_write failed");
|
|
|
|
|
|
|
|
|
|
|
|
if (wolfSSL_read(ssl, reply, sizeof(reply)-1) <= 0)
|
|
|
|
|
|
err_sys("SSL_read failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2018-04-09 13:53:05 +10:00
|
|
|
|
|
2015-10-14 19:13:45 -07:00
|
|
|
|
wolfSSL_shutdown(ssl);
|
2016-02-22 10:11:41 +01:00
|
|
|
|
#ifndef NO_SESSION_CACHE
|
2015-10-14 19:13:45 -07:00
|
|
|
|
if (i == (times-1) && resumeSession) {
|
2022-03-17 12:56:28 +01:00
|
|
|
|
if (benchSession != NULL)
|
|
|
|
|
|
wolfSSL_SESSION_free(benchSession);
|
|
|
|
|
|
benchSession = wolfSSL_get1_session(ssl);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
}
|
2016-02-22 10:11:41 +01:00
|
|
|
|
#endif
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
CloseSocket(sockfd);
|
|
|
|
|
|
}
|
2016-04-14 16:26:51 +09:00
|
|
|
|
avg = current_time(0) - start;
|
2018-04-09 13:53:05 +10:00
|
|
|
|
avg /= (times - skip);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
avg *= 1000; /* milliseconds */
|
2016-02-22 10:11:41 +01:00
|
|
|
|
#ifndef NO_SESSION_CACHE
|
2015-10-14 19:13:45 -07:00
|
|
|
|
if (benchResume)
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s %8.3f %s\n", words[0],avg, words[1]);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
else
|
2016-02-22 10:11:41 +01:00
|
|
|
|
#endif
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s %8.3f %s\n", words[2],avg, words[3]);
|
2018-04-09 13:53:05 +10:00
|
|
|
|
|
|
|
|
|
|
WOLFSSL_TIME(times);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
2022-03-17 12:56:28 +01:00
|
|
|
|
#ifndef NO_SESSION_CACHE
|
|
|
|
|
|
if (benchSession != NULL)
|
|
|
|
|
|
wolfSSL_SESSION_free(benchSession);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2015-10-14 19:13:45 -07:00
|
|
|
|
return EXIT_SUCCESS;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-12-08 16:43:42 -06:00
|
|
|
|
/* Measures throughput in mbps. Throughput = number of bytes */
|
2016-08-25 22:20:35 -07:00
|
|
|
|
static int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port,
|
2020-02-19 18:07:45 +10:00
|
|
|
|
int dtlsUDP, int dtlsSCTP, int block, size_t throughput, int useX25519,
|
2021-12-20 11:26:25 -05:00
|
|
|
|
int useX448, int usePqc, char* pqcAlg, int exitWithRet, int version,
|
2021-04-28 10:28:35 -07:00
|
|
|
|
int onlyKeyShare)
|
2015-10-14 19:13:45 -07:00
|
|
|
|
{
|
|
|
|
|
|
double start, conn_time = 0, tx_time = 0, rx_time = 0;
|
2021-12-04 00:57:49 -06:00
|
|
|
|
SOCKET_T sockfd = WOLFSSL_SOCKET_INVALID;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
WOLFSSL* ssl;
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
int ret = 0, err = 0;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
2016-04-14 16:26:51 +09:00
|
|
|
|
start = current_time(1);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
ssl = wolfSSL_new(ctx);
|
2015-10-16 14:12:38 -07:00
|
|
|
|
if (ssl == NULL)
|
|
|
|
|
|
err_sys("unable to get SSL object");
|
2016-11-24 01:31:07 +10:00
|
|
|
|
|
2016-08-25 22:20:35 -07:00
|
|
|
|
tcp_connect(&sockfd, host, port, dtlsUDP, dtlsSCTP, ssl);
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_set_fd(ssl, sockfd) != WOLFSSL_SUCCESS) {
|
2016-03-25 13:59:04 -06:00
|
|
|
|
err_sys("error in setting fd");
|
|
|
|
|
|
}
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
|
2017-05-31 11:44:43 +10:00
|
|
|
|
(void)useX25519;
|
2020-02-19 18:07:45 +10:00
|
|
|
|
(void)useX448;
|
2021-12-20 11:26:25 -05:00
|
|
|
|
(void)usePqc;
|
|
|
|
|
|
(void)pqcAlg;
|
2021-06-08 12:15:42 -07:00
|
|
|
|
(void)version;
|
|
|
|
|
|
(void)onlyKeyShare;
|
|
|
|
|
|
#if defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES)
|
|
|
|
|
|
if (version >= 4) {
|
2021-12-20 11:26:25 -05:00
|
|
|
|
SetKeyShare(ssl, onlyKeyShare, useX25519, useX448, usePqc,
|
|
|
|
|
|
pqcAlg, 1);
|
2021-06-08 12:15:42 -07:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2017-05-31 11:44:43 +10:00
|
|
|
|
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
do {
|
|
|
|
|
|
err = 0; /* reset error */
|
|
|
|
|
|
ret = wolfSSL_connect(ssl);
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (ret != WOLFSSL_SUCCESS) {
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
} while (err == WC_PENDING_E);
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (ret == WOLFSSL_SUCCESS) {
|
2015-10-14 19:13:45 -07:00
|
|
|
|
/* Perform throughput test */
|
|
|
|
|
|
char *tx_buffer, *rx_buffer;
|
|
|
|
|
|
|
|
|
|
|
|
/* Record connection time */
|
2016-04-14 16:26:51 +09:00
|
|
|
|
conn_time = current_time(0) - start;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
|
|
|
|
|
/* Allocate TX/RX buffers */
|
2018-04-09 13:53:05 +10:00
|
|
|
|
tx_buffer = (char*)XMALLOC(block, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
|
|
|
rx_buffer = (char*)XMALLOC(block, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
if (tx_buffer && rx_buffer) {
|
2015-10-14 19:13:45 -07:00
|
|
|
|
WC_RNG rng;
|
|
|
|
|
|
|
|
|
|
|
|
/* Startup the RNG */
|
2017-04-10 14:19:20 -07:00
|
|
|
|
#if !defined(HAVE_FIPS) && defined(WOLFSSL_ASYNC_CRYPT)
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
ret = wc_InitRng_ex(&rng, NULL, devId);
|
|
|
|
|
|
#else
|
2015-10-14 19:13:45 -07:00
|
|
|
|
ret = wc_InitRng(&rng);
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
if (ret == 0) {
|
2019-12-18 07:09:26 -08:00
|
|
|
|
size_t xfer_bytes;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
|
|
|
|
|
/* Generate random data to send */
|
2018-04-09 13:53:05 +10:00
|
|
|
|
ret = wc_RNG_GenerateBlock(&rng, (byte*)tx_buffer, block);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
wc_FreeRng(&rng);
|
|
|
|
|
|
if(ret != 0) {
|
|
|
|
|
|
err_sys("wc_RNG_GenerateBlock failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Perform TX and RX of bytes */
|
|
|
|
|
|
xfer_bytes = 0;
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
while (throughput > xfer_bytes) {
|
2015-10-15 13:42:41 -07:00
|
|
|
|
int len, rx_pos, select_ret;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
|
|
|
|
|
/* Determine packet size */
|
2019-12-18 07:09:26 -08:00
|
|
|
|
len = min(block, (int)(throughput - xfer_bytes));
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
|
|
|
|
|
/* Perform TX */
|
2016-04-14 16:26:51 +09:00
|
|
|
|
start = current_time(1);
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
do {
|
|
|
|
|
|
err = 0; /* reset error */
|
|
|
|
|
|
ret = wolfSSL_write(ssl, tx_buffer, len);
|
|
|
|
|
|
if (ret <= 0) {
|
|
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
} while (err == WC_PENDING_E);
|
|
|
|
|
|
if (ret != len) {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "SSL_write bench error %d!\n", err);
|
2020-07-22 13:20:23 -07:00
|
|
|
|
if (!exitWithRet)
|
|
|
|
|
|
err_sys("SSL_write failed");
|
|
|
|
|
|
goto doExit;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
}
|
2016-04-14 16:26:51 +09:00
|
|
|
|
tx_time += current_time(0) - start;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
|
|
|
|
|
/* Perform RX */
|
2017-03-06 09:49:05 -08:00
|
|
|
|
select_ret = tcp_select(sockfd, DEFAULT_TIMEOUT_SEC);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
if (select_ret == TEST_RECV_READY) {
|
2016-04-14 16:26:51 +09:00
|
|
|
|
start = current_time(1);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
rx_pos = 0;
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
while (rx_pos < len) {
|
|
|
|
|
|
ret = wolfSSL_read(ssl, &rx_buffer[rx_pos],
|
|
|
|
|
|
len - rx_pos);
|
|
|
|
|
|
if (ret <= 0) {
|
|
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
#endif
|
2022-05-20 10:00:37 +02:00
|
|
|
|
if (err != WOLFSSL_ERROR_WANT_READ &&
|
|
|
|
|
|
err != WOLFSSL_ERROR_WANT_WRITE) {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "SSL_read bench error %d\n", err);
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
err_sys("SSL_read failed");
|
2015-10-14 19:13:45 -07:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
rx_pos += ret;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2016-04-14 16:26:51 +09:00
|
|
|
|
rx_time += current_time(0) - start;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Compare TX and RX buffers */
|
2019-01-11 08:45:34 -08:00
|
|
|
|
if (XMEMCMP(tx_buffer, rx_buffer, len) != 0) {
|
2017-03-15 09:38:53 +10:00
|
|
|
|
free(tx_buffer);
|
|
|
|
|
|
tx_buffer = NULL;
|
|
|
|
|
|
free(rx_buffer);
|
|
|
|
|
|
rx_buffer = NULL;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
err_sys("Compare TX and RX buffers failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Update overall position */
|
|
|
|
|
|
xfer_bytes += len;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
err_sys("wc_InitRng failed");
|
|
|
|
|
|
}
|
2018-09-13 13:23:55 -07:00
|
|
|
|
(void)rng; /* for WC_NO_RNG case */
|
2015-10-14 19:13:45 -07:00
|
|
|
|
}
|
|
|
|
|
|
else {
|
2015-10-15 13:42:41 -07:00
|
|
|
|
err_sys("Client buffer malloc failed");
|
2015-10-14 19:13:45 -07:00
|
|
|
|
}
|
2020-07-22 13:20:23 -07:00
|
|
|
|
doExit:
|
2023-04-03 16:51:07 +10:00
|
|
|
|
XFREE(tx_buffer, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
|
|
|
XFREE(rx_buffer, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
err_sys("wolfSSL_connect failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
wolfSSL_shutdown(ssl);
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
CloseSocket(sockfd);
|
|
|
|
|
|
|
2020-07-22 13:20:23 -07:00
|
|
|
|
if (exitWithRet)
|
|
|
|
|
|
return err;
|
|
|
|
|
|
|
2023-01-05 00:13:17 -06:00
|
|
|
|
#ifdef __MINGW32__
|
|
|
|
|
|
#define SIZE_FMT "%d"
|
|
|
|
|
|
#define SIZE_TYPE int
|
2020-01-22 08:12:51 +09:00
|
|
|
|
#else
|
2023-01-05 00:13:17 -06:00
|
|
|
|
#define SIZE_FMT "%zu"
|
|
|
|
|
|
#define SIZE_TYPE size_t
|
2020-01-22 08:12:51 +09:00
|
|
|
|
#endif
|
2023-01-05 00:13:17 -06:00
|
|
|
|
printf(
|
|
|
|
|
|
"wolfSSL Client Benchmark " SIZE_FMT " bytes\n"
|
2015-10-14 19:13:45 -07:00
|
|
|
|
"\tConnect %8.3f ms\n"
|
|
|
|
|
|
"\tTX %8.3f ms (%8.3f MBps)\n"
|
|
|
|
|
|
"\tRX %8.3f ms (%8.3f MBps)\n",
|
2023-01-05 00:13:17 -06:00
|
|
|
|
(SIZE_TYPE)throughput,
|
2015-10-14 19:13:45 -07:00
|
|
|
|
conn_time * 1000,
|
|
|
|
|
|
tx_time * 1000, throughput / tx_time / 1024 / 1024,
|
|
|
|
|
|
rx_time * 1000, throughput / rx_time / 1024 / 1024
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
return EXIT_SUCCESS;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2016-04-28 14:21:33 -06:00
|
|
|
|
const char* starttlsCmd[6] = {
|
|
|
|
|
|
"220",
|
|
|
|
|
|
"EHLO mail.example.com\r\n",
|
|
|
|
|
|
"250",
|
|
|
|
|
|
"STARTTLS\r\n",
|
|
|
|
|
|
"220",
|
|
|
|
|
|
"QUIT\r\n",
|
|
|
|
|
|
};
|
|
|
|
|
|
|
2016-08-25 22:20:35 -07:00
|
|
|
|
/* Initiates the STARTTLS command sequence over TCP */
|
|
|
|
|
|
static int StartTLS_Init(SOCKET_T* sockfd)
|
2016-04-28 14:21:33 -06:00
|
|
|
|
{
|
2021-10-12 15:13:38 -07:00
|
|
|
|
char tmpBuf[512];
|
2016-04-28 14:21:33 -06:00
|
|
|
|
|
|
|
|
|
|
if (sockfd == NULL)
|
|
|
|
|
|
return BAD_FUNC_ARG;
|
|
|
|
|
|
|
|
|
|
|
|
/* S: 220 <host> SMTP service ready */
|
2017-04-28 14:59:45 -07:00
|
|
|
|
XMEMSET(tmpBuf, 0, sizeof(tmpBuf));
|
|
|
|
|
|
if (recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1, 0) < 0)
|
2016-04-28 14:21:33 -06:00
|
|
|
|
err_sys("failed to read STARTTLS command\n");
|
|
|
|
|
|
|
2023-01-04 02:28:23 +09:00
|
|
|
|
if ((!XSTRNCMP(tmpBuf, starttlsCmd[0], XSTRLEN(starttlsCmd[0]))) &&
|
|
|
|
|
|
(tmpBuf[XSTRLEN(starttlsCmd[0])] == ' ')) {
|
2016-04-28 14:21:33 -06:00
|
|
|
|
printf("%s\n", tmpBuf);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
err_sys("incorrect STARTTLS command received");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* C: EHLO mail.example.com */
|
2016-05-02 10:10:25 -06:00
|
|
|
|
if (send(*sockfd, starttlsCmd[1], (int)XSTRLEN(starttlsCmd[1]), 0) !=
|
2016-05-03 13:52:04 -06:00
|
|
|
|
(int)XSTRLEN(starttlsCmd[1]))
|
2016-04-28 14:21:33 -06:00
|
|
|
|
err_sys("failed to send STARTTLS EHLO command\n");
|
|
|
|
|
|
|
|
|
|
|
|
/* S: 250 <host> offers a warm hug of welcome */
|
2017-04-28 14:59:45 -07:00
|
|
|
|
XMEMSET(tmpBuf, 0, sizeof(tmpBuf));
|
|
|
|
|
|
if (recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1, 0) < 0)
|
2016-04-28 14:21:33 -06:00
|
|
|
|
err_sys("failed to read STARTTLS command\n");
|
|
|
|
|
|
|
2023-01-04 02:28:23 +09:00
|
|
|
|
if ((!XSTRNCMP(tmpBuf, starttlsCmd[2], XSTRLEN(starttlsCmd[2]))) &&
|
|
|
|
|
|
(tmpBuf[XSTRLEN(starttlsCmd[2])] == '-')) {
|
2016-04-28 14:21:33 -06:00
|
|
|
|
printf("%s\n", tmpBuf);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
err_sys("incorrect STARTTLS command received");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* C: STARTTLS */
|
2016-05-02 10:10:25 -06:00
|
|
|
|
if (send(*sockfd, starttlsCmd[3], (int)XSTRLEN(starttlsCmd[3]), 0) !=
|
2016-05-03 13:52:04 -06:00
|
|
|
|
(int)XSTRLEN(starttlsCmd[3])) {
|
2016-04-28 14:21:33 -06:00
|
|
|
|
err_sys("failed to send STARTTLS command\n");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* S: 220 Go ahead */
|
2017-04-28 14:59:45 -07:00
|
|
|
|
XMEMSET(tmpBuf, 0, sizeof(tmpBuf));
|
|
|
|
|
|
if (recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1, 0) < 0)
|
2016-04-28 14:21:33 -06:00
|
|
|
|
err_sys("failed to read STARTTLS command\n");
|
2020-06-04 21:05:07 -07:00
|
|
|
|
tmpBuf[sizeof(tmpBuf)-1] = '\0';
|
2023-01-04 02:28:23 +09:00
|
|
|
|
|
|
|
|
|
|
if ((!XSTRNCMP(tmpBuf, starttlsCmd[4], XSTRLEN(starttlsCmd[4]))) &&
|
|
|
|
|
|
(tmpBuf[XSTRLEN(starttlsCmd[4])] == ' ')) {
|
2016-04-28 14:21:33 -06:00
|
|
|
|
printf("%s\n", tmpBuf);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
err_sys("incorrect STARTTLS command received, expected 220");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-10-11 09:09:52 -07:00
|
|
|
|
return WOLFSSL_SUCCESS;
|
2016-04-28 14:21:33 -06:00
|
|
|
|
}
|
|
|
|
|
|
|
2016-08-25 22:20:35 -07:00
|
|
|
|
/* Closes down the SMTP connection */
|
|
|
|
|
|
static int SMTP_Shutdown(WOLFSSL* ssl, int wc_shutdown)
|
2016-04-28 14:21:33 -06:00
|
|
|
|
{
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
int ret, err = 0;
|
2016-04-28 14:21:33 -06:00
|
|
|
|
char tmpBuf[256];
|
|
|
|
|
|
|
|
|
|
|
|
if (ssl == NULL)
|
|
|
|
|
|
return BAD_FUNC_ARG;
|
|
|
|
|
|
|
|
|
|
|
|
printf("\nwolfSSL client shutting down SMTP connection\n");
|
|
|
|
|
|
|
|
|
|
|
|
XMEMSET(tmpBuf, 0, sizeof(tmpBuf));
|
|
|
|
|
|
|
|
|
|
|
|
/* C: QUIT */
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
do {
|
|
|
|
|
|
ret = wolfSSL_write(ssl, starttlsCmd[5], (int)XSTRLEN(starttlsCmd[5]));
|
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
} while (err == WC_PENDING_E);
|
|
|
|
|
|
if (ret != (int)XSTRLEN(starttlsCmd[5])) {
|
2016-04-28 14:21:33 -06:00
|
|
|
|
err_sys("failed to send SMTP QUIT command\n");
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
}
|
2016-04-28 14:21:33 -06:00
|
|
|
|
|
|
|
|
|
|
/* S: 221 2.0.0 Service closing transmission channel */
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
do {
|
2020-07-21 13:34:25 -07:00
|
|
|
|
ret = wolfSSL_read(ssl, tmpBuf, sizeof(tmpBuf)-1);
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
if (ret < 0) {
|
|
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
} while (err == WC_PENDING_E);
|
|
|
|
|
|
if (ret < 0) {
|
2016-04-28 14:21:33 -06:00
|
|
|
|
err_sys("failed to read SMTP closing down response\n");
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
}
|
2020-07-21 13:34:25 -07:00
|
|
|
|
tmpBuf[ret] = 0; /* null terminate message */
|
2016-04-28 14:21:33 -06:00
|
|
|
|
printf("%s\n", tmpBuf);
|
|
|
|
|
|
|
|
|
|
|
|
ret = wolfSSL_shutdown(ssl);
|
2020-04-01 17:48:17 -05:00
|
|
|
|
if (wc_shutdown && ret == WOLFSSL_SHUTDOWN_NOT_DONE) {
|
2020-04-01 11:14:25 -05:00
|
|
|
|
if (tcp_select(wolfSSL_get_fd(ssl), DEFAULT_TIMEOUT_SEC) ==
|
|
|
|
|
|
TEST_RECV_READY) {
|
|
|
|
|
|
ret = wolfSSL_shutdown(ssl); /* bidirectional shutdown */
|
|
|
|
|
|
if (ret == WOLFSSL_SUCCESS)
|
|
|
|
|
|
printf("Bidirectional shutdown complete\n");
|
|
|
|
|
|
}
|
2020-04-01 17:48:17 -05:00
|
|
|
|
if (ret != WOLFSSL_SUCCESS)
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "Bidirectional shutdown failed\n");
|
2020-04-01 11:14:25 -05:00
|
|
|
|
}
|
2016-04-28 14:21:33 -06:00
|
|
|
|
|
2017-10-11 09:09:52 -07:00
|
|
|
|
return WOLFSSL_SUCCESS;
|
2016-04-28 14:21:33 -06:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-10-06 17:16:01 -07:00
|
|
|
|
static int ClientWrite(WOLFSSL* ssl, const char* msg, int msgSz, const char* str,
|
2020-05-22 11:43:41 -07:00
|
|
|
|
int exitWithRet)
|
2017-06-08 10:32:51 +10:00
|
|
|
|
{
|
|
|
|
|
|
int ret, err;
|
|
|
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
|
err = 0; /* reset error */
|
|
|
|
|
|
ret = wolfSSL_write(ssl, msg, msgSz);
|
|
|
|
|
|
if (ret <= 0) {
|
|
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
2020-08-25 11:26:20 +02:00
|
|
|
|
} while (err == WOLFSSL_ERROR_WANT_WRITE ||
|
|
|
|
|
|
err == WOLFSSL_ERROR_WANT_READ
|
2018-06-08 17:34:03 +10:00
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
|| err == WC_PENDING_E
|
|
|
|
|
|
#endif
|
|
|
|
|
|
);
|
2017-06-08 10:32:51 +10:00
|
|
|
|
if (ret != msgSz) {
|
2023-04-03 16:51:07 +10:00
|
|
|
|
char buffer[WOLFSSL_MAX_ERROR_SZ];
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "SSL_write%s msg error %d, %s\n", str, err,
|
2017-06-08 10:32:51 +10:00
|
|
|
|
wolfSSL_ERR_error_string(err, buffer));
|
2020-05-22 11:43:41 -07:00
|
|
|
|
if (!exitWithRet) {
|
|
|
|
|
|
err_sys("SSL_write failed");
|
|
|
|
|
|
}
|
2017-06-08 10:32:51 +10:00
|
|
|
|
}
|
2020-05-22 11:43:41 -07:00
|
|
|
|
|
|
|
|
|
|
return err;
|
2017-06-08 10:32:51 +10:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-04-27 14:03:15 +10:00
|
|
|
|
static int ClientRead(WOLFSSL* ssl, char* reply, int replyLen, int mustRead,
|
|
|
|
|
|
const char* str, int exitWithRet)
|
2017-06-08 10:32:51 +10:00
|
|
|
|
{
|
|
|
|
|
|
int ret, err;
|
|
|
|
|
|
char buffer[WOLFSSL_MAX_ERROR_SZ];
|
2019-01-11 08:45:34 -08:00
|
|
|
|
double start = current_time(1), elapsed;
|
2017-06-08 10:32:51 +10:00
|
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
|
err = 0; /* reset error */
|
|
|
|
|
|
ret = wolfSSL_read(ssl, reply, replyLen);
|
|
|
|
|
|
if (ret <= 0) {
|
|
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
#endif
|
2022-05-27 21:26:08 +02:00
|
|
|
|
if (err != WOLFSSL_ERROR_WANT_READ &&
|
|
|
|
|
|
err != WOLFSSL_ERROR_WANT_WRITE && err != APP_DATA_READY) {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "SSL_read reply error %d, %s\n", err,
|
2017-06-08 10:32:51 +10:00
|
|
|
|
wolfSSL_ERR_error_string(err, buffer));
|
2020-04-27 14:03:15 +10:00
|
|
|
|
if (!exitWithRet) {
|
|
|
|
|
|
err_sys("SSL_read failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
2017-06-08 10:32:51 +10:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2019-01-11 08:45:34 -08:00
|
|
|
|
|
2022-05-20 10:00:37 +02:00
|
|
|
|
if (mustRead &&
|
|
|
|
|
|
(err == WOLFSSL_ERROR_WANT_READ
|
|
|
|
|
|
|| err == WOLFSSL_ERROR_WANT_WRITE)) {
|
2019-01-11 08:45:34 -08:00
|
|
|
|
elapsed = current_time(0) - start;
|
|
|
|
|
|
if (elapsed > MAX_NON_BLOCK_SEC) {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "Nonblocking read timeout\n");
|
2019-01-11 09:42:41 -08:00
|
|
|
|
ret = WOLFSSL_FATAL_ERROR;
|
2019-01-11 08:45:34 -08:00
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2018-03-16 12:02:36 -07:00
|
|
|
|
} while ((mustRead && err == WOLFSSL_ERROR_WANT_READ)
|
2022-05-27 21:26:08 +02:00
|
|
|
|
|| err == WOLFSSL_ERROR_WANT_WRITE
|
2018-03-16 12:02:36 -07:00
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
|| err == WC_PENDING_E
|
|
|
|
|
|
#endif
|
2021-04-20 16:15:42 +02:00
|
|
|
|
|| err == APP_DATA_READY
|
2018-03-16 12:02:36 -07:00
|
|
|
|
);
|
2017-06-08 10:32:51 +10:00
|
|
|
|
if (ret > 0) {
|
2020-07-21 13:34:25 -07:00
|
|
|
|
reply[ret] = 0; /* null terminate */
|
2020-01-24 10:40:39 -08:00
|
|
|
|
printf("%s%s\n", str, reply);
|
2017-06-08 10:32:51 +10:00
|
|
|
|
}
|
2020-04-27 14:03:15 +10:00
|
|
|
|
|
|
|
|
|
|
return err;
|
2017-06-08 10:32:51 +10:00
|
|
|
|
}
|
2015-10-02 16:25:17 -07:00
|
|
|
|
|
2018-08-28 15:37:15 +10:00
|
|
|
|
|
2018-10-20 13:40:01 +09:00
|
|
|
|
/* when adding new option, please follow the steps below: */
|
|
|
|
|
|
/* 1. add new option message in English section */
|
2019-12-24 12:29:33 -06:00
|
|
|
|
/* 2. increase the number of the second column */
|
2020-09-17 22:09:51 -05:00
|
|
|
|
/* 3. increase the array dimension */
|
|
|
|
|
|
/* 4. add the same message into Japanese section */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
/* (will be translated later) */
|
2020-09-17 22:09:51 -05:00
|
|
|
|
/* 5. add printf() into suitable position of Usage() */
|
2021-08-02 20:27:41 -06:00
|
|
|
|
static const char* client_usage_msg[][70] = {
|
2018-10-20 13:40:01 +09:00
|
|
|
|
/* English */
|
|
|
|
|
|
{
|
|
|
|
|
|
" NOTE: All files relative to wolfSSL home dir\n", /* 0 */
|
|
|
|
|
|
"Max RSA key size in bits for build is set at : ", /* 1 */
|
|
|
|
|
|
#ifdef NO_RSA
|
|
|
|
|
|
"RSA not supported\n", /* 2 */
|
|
|
|
|
|
#elif defined(WOLFSSL_SP_MATH) /* case of SP math only */
|
2020-10-26 17:16:02 -05:00
|
|
|
|
#ifdef WOLFSSL_SP_4096
|
|
|
|
|
|
"4096\n", /* 2 */
|
|
|
|
|
|
#elif !defined(WOLFSSL_SP_NO_3072)
|
2018-10-20 13:40:01 +09:00
|
|
|
|
"3072\n", /* 2 */
|
|
|
|
|
|
#elif !defined(WOLFSSL_SP_NO_2048)
|
|
|
|
|
|
"2048\n", /* 2 */
|
|
|
|
|
|
#else
|
|
|
|
|
|
"0\n", /* 2 */
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#elif defined(USE_FAST_MATH)
|
|
|
|
|
|
#else
|
|
|
|
|
|
"INFINITE\n", /* 2 */
|
|
|
|
|
|
#endif
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-? <num> Help, print this usage\n"
|
jumbo patch of fixes for clang-tidy gripes (with some bug fixes).
defect/gripe statistics:
configured --enable-all --enable-sp-math-all --enable-intelasm
with LLVM 13 clang-tidy -checks=readability-*,bugprone-*,misc-no-recursion,misc-misplaced-const,misc-redundant-expression,misc-unused-parameters,misc-unused-using-decls,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-clang-analyzer-optin.performance.Padding,-readability-braces-around-statements,-readability-function-size,-readability-function-cognitive-complexity,-bugprone-suspicious-include,-bugprone-easily-swappable-parameters,-readability-isolate-declaration,-readability-magic-numbers,-readability-else-after-return,-bugprone-reserved-identifier,-readability-suspicious-call-argument,-bugprone-suspicious-string-compare,-bugprone-branch-clone,-misc-redundant-expression,-readability-non-const-parameter,-readability-redundant-control-flow,-readability-misleading-indentation,-bugprone-narrowing-conversions,-bugprone-implicit-widening-of-multiplication-result
[note these figures don't reflect additional defects fixed in this commit for --enable-smallstack, --enable-fips, --enable-async, --enable-asn=template, and --enable-fastmath, and --disable-fastmath]
pre-patch warning count per file, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 6 wolfssl/tests/suites.c
clang-analyzer-security.insecureAPI.strcpy 2 wolfssl/testsuite/testsuite.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/server/server.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/client/client.c
readability-redundant-preprocessor 2 wolfssl/wolfcrypt/src/asn.c
readability-redundant-preprocessor 1 wolfssl/wolfcrypt/src/rsa.c
readability-redundant-preprocessor 9 wolfssl/src/ssl.c
readability-redundant-preprocessor 2 wolfssl/src/tls13.c
readability-redundant-preprocessor 18 wolfssl/tests/api.c
readability-redundant-preprocessor 3 wolfssl/src/internal.c
readability-redundant-preprocessor 10 wolfssl/wolfcrypt/test/test.c
readability-named-parameter 1 wolfssl/wolfcrypt/benchmark/benchmark.c
readability-named-parameter 7 wolfssl/src/internal.c
readability-named-parameter 1 wolfssl/wolfcrypt/src/ecc.c
readability-named-parameter 1 wolfssl/testsuite/testsuite.c
readability-named-parameter 11 wolfssl/wolfcrypt/src/ge_operations.c
misc-no-recursion 3 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 4 wolfssl/wolfcrypt/src/asn.c
readability-uppercase-literal-suffix 1 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 13 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-too-small-loop-variable 1 wolfssl/wolfcrypt/src/rsa.c
bugprone-too-small-loop-variable 2 wolfssl/wolfcrypt/src/sha3.c
bugprone-too-small-loop-variable 4 wolfssl/wolfcrypt/src/idea.c
bugprone-signed-char-misuse 2 wolfssl/src/ssl.c
bugprone-signed-char-misuse 3 wolfssl/wolfcrypt/src/sp_int.c
bugprone-signed-char-misuse 3 wolfssl/examples/client/client.c
bugprone-macro-parentheses 19 wolfssl/wolfcrypt/src/aes.c
bugprone-macro-parentheses 109 wolfssl/wolfcrypt/src/camellia.c
bugprone-macro-parentheses 1 wolfssl/src/tls.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/md4.c
bugprone-macro-parentheses 2 wolfssl/wolfcrypt/src/asn.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2b.c
bugprone-macro-parentheses 257 wolfssl/wolfcrypt/src/sha3.c
bugprone-macro-parentheses 15 wolfssl/src/ssl.c
bugprone-macro-parentheses 1 wolfssl/wolfcrypt/src/sha.c
bugprone-macro-parentheses 8 wolfssl/tests/api.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/sp_int.c
bugprone-macro-parentheses 6 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-macro-parentheses 38 wolfssl/wolfcrypt/src/hc128.c
bugprone-macro-parentheses 12 wolfssl/wolfcrypt/src/md5.c
bugprone-macro-parentheses 10 wolfssl/wolfcrypt/src/sha256.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/test/test.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/ecc.c
bugprone-macro-parentheses 2 wolfssl/tests/suites.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/cpuid.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2s.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/sha512.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/poly1305.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/ripemd.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/src/internal.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/testsuite/testsuite.c
pre-patch warning count summaries, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-suspicious-missing-comma 6
readability-redundant-preprocessor 45
readability-named-parameter 21
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-too-small-loop-variable 7
bugprone-signed-char-misuse 8
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
pre-patch warning count summaries, without suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-branch-clone 152
readability-non-const-parameter 118
bugprone-suspicious-missing-comma 6
bugprone-suspicious-include 52
readability-magic-numbers 22423
readability-redundant-preprocessor 45
readability-named-parameter 21
readability-function-cognitive-complexity 845
readability-else-after-return 398
bugprone-implicit-widening-of-multiplication-result 595
readability-function-size 21
readability-isolate-declaration 1090
misc-redundant-expression 2
bugprone-narrowing-conversions 994
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-reserved-identifier 56
readability-suspicious-call-argument 74
bugprone-too-small-loop-variable 7
bugprone-easily-swappable-parameters 437
bugprone-signed-char-misuse 8
readability-misleading-indentation 94
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
bugprone-suspicious-string-compare 495
readability-redundant-control-flow 20
readability-braces-around-statements 11483
clang-analyzer-valist.Uninitialized 1
clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling 3502
2022-01-19 23:09:50 -06:00
|
|
|
|
" 0: English, 1: Japanese\n"
|
|
|
|
|
|
"--help Help, in English\n", /* 3 */
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-h <host> Host to connect to, default", /* 4 */
|
|
|
|
|
|
"-p <num> Port to connect on, not 0, default", /* 5 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
|
|
|
|
|
|
#ifndef WOLFSSL_TLS13
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-v <num> SSL version [0-3], SSLv3(0) - TLS1.2(3)), default", /* 6 */
|
|
|
|
|
|
"-V Prints valid ssl version numbers"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
", SSLv3(0) - TLS1.2(3)\n", /* 7 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#else
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-v <num> SSL version [0-4], SSLv3(0) - TLS1.3(4)), default", /* 6 */
|
|
|
|
|
|
"-V Prints valid ssl version numbers,"
|
|
|
|
|
|
" SSLv3(0) - TLS1.3(4)\n", /* 7 */
|
|
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-l <str> Cipher suite list (: delimited)\n", /* 8 */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#ifndef NO_CERTS
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-c <file> Certificate file, default", /* 9 */
|
|
|
|
|
|
"-k <file> Key file, default", /* 10 */
|
|
|
|
|
|
"-A <file> Certificate Authority file, default", /* 11 */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#endif
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifndef NO_DH
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-Z <num> Minimum DH key bits, default", /* 12 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-b <num> Benchmark <num> connections and print stats\n", /* 13 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifdef HAVE_ALPN
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-L <str> Application-Layer Protocol"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
" Negotiation ({C,F}:<list>)\n", /* 14 */
|
2018-10-20 17:15:17 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
"-B <num> Benchmark throughput"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
" using <num> bytes and print stats\n", /* 15 */
|
2020-08-25 11:26:53 +10:00
|
|
|
|
#ifndef NO_PSK
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-s Use pre Shared keys\n", /* 16 */
|
2020-08-25 11:26:53 +10:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-d Disable peer checks\n", /* 17 */
|
|
|
|
|
|
"-D Override Date Errors example\n", /* 18 */
|
|
|
|
|
|
"-e List Every cipher suite available, \n", /* 19 */
|
|
|
|
|
|
"-g Send server HTTP GET\n", /* 20 */
|
2022-06-17 17:07:33 +02:00
|
|
|
|
#ifndef WOLFSSL_DTLS13
|
2022-06-23 15:25:23 -05:00
|
|
|
|
"-u Use UDP DTLS, add -v 2 for DTLSv1, -v 3 for DTLSv1.2"
|
|
|
|
|
|
" (default)\n", /* 21 */
|
2022-06-17 17:07:33 +02:00
|
|
|
|
#else
|
2022-06-23 15:25:23 -05:00
|
|
|
|
"-u Use UDP DTLS, add -v 2 for DTLSv1, -v 3 for DTLSv1.2"
|
|
|
|
|
|
" (default), -v 4 for DTLSv1.3\n", /* 21 */
|
2022-06-17 17:07:33 +02:00
|
|
|
|
#endif /* !WOLFSSL_DTLS13 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifdef WOLFSSL_SCTP
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-G Use SCTP DTLS,"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
" add -v 2 for DTLSv1, -v 3 for DTLSv1.2 (default)\n", /* 22 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#ifndef NO_CERTS
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-m Match domain name in cert\n", /* 23 */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-N Use Non-blocking sockets\n", /* 24 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifndef NO_SESSION_CACHE
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-r Resume session\n", /* 25 */
|
2019-01-10 17:12:37 -08:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-w Wait for bidirectional shutdown\n", /* 26 */
|
|
|
|
|
|
"-M <prot> Use STARTTLS, using <prot> protocol (smtp)\n", /* 27 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifdef HAVE_SECURE_RENEGOTIATION
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-R Allow Secure Renegotiation\n", /* 28 */
|
2020-09-30 13:46:23 +02:00
|
|
|
|
"-i <str> Force client Initiated Secure Renegotiation. If the\n"
|
|
|
|
|
|
" string 'scr-app-data' is passed in as the value and\n"
|
|
|
|
|
|
" Non-blocking sockets are enabled ('-N') then wolfSSL\n"
|
|
|
|
|
|
" sends a test message during the secure renegotiation.\n"
|
|
|
|
|
|
" The string parameter is optional.\n", /* 29 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-f Fewer packets/group messages\n", /* 30 */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#ifndef NO_CERTS
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-x Disable client cert/key loading\n", /* 31 */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-X Driven by eXternal test case\n", /* 32 */
|
|
|
|
|
|
"-j Use verify callback override\n", /* 33 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifdef SHOW_SIZES
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-z Print structure sizes\n", /* 34 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_SNI
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-S <str> Use Host Name Indication\n", /* 35 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_MAX_FRAGMENT
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-F <num> Use Maximum Fragment Length [1-6]\n", /* 36 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_TRUNCATED_HMAC
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-T Use Truncated HMAC\n", /* 37 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_EXTENDED_MASTER
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-n Disable Extended Master Secret\n", /* 38 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_OCSP
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-o Perform OCSP lookup on peer certificate\n", /* 39 */
|
|
|
|
|
|
"-O <url> Perform OCSP lookup using <url> as responder\n", /* 40 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#if defined(HAVE_CERTIFICATE_STATUS_REQUEST) \
|
|
|
|
|
|
|| defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2)
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-W <num> Use OCSP Stapling (1 v1, 2 v2, 3 v2 multi)\n", /* 41 */
|
2020-10-15 17:27:58 +10:00
|
|
|
|
" With 'm' at end indicates MUST staple\n", /* 42 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
2019-08-22 09:33:38 +10:00
|
|
|
|
#if defined(ATOMIC_USER) && !defined(WOLFSSL_AEAD_ONLY)
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-U Atomic User Record Layer Callbacks\n", /* 43 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_PK_CALLBACKS
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-P Public Key Callbacks\n", /* 44 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_ANON
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-a Anonymous client\n", /* 45 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_CRL
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-C Disable CRL\n", /* 46 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef WOLFSSL_TRUST_PEER_CERT
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-E <file> Path to load trusted peer cert\n", /* 47 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_WNR
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-q <file> Whitewood config file, defaults\n", /* 48 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-H <arg> Internal tests"
|
2020-10-15 17:27:58 +10:00
|
|
|
|
" [defCipherList, exitWithRet, verifyFail, useSupCurve,\n", /* 49 */
|
|
|
|
|
|
" loadSSL, disallowETM]\n", /* 50 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifdef WOLFSSL_TLS13
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-J Use HelloRetryRequest to choose group for KE\n", /* 51 */
|
|
|
|
|
|
"-K Key Exchange for PSK not using (EC)DHE\n", /* 52 */
|
|
|
|
|
|
"-I Update keys and IVs before sending data\n", /* 53 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifndef NO_DH
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-y Key Share with FFDHE named groups only\n", /* 54 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_ECC
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-Y Key Share with ECC named groups only\n", /* 55 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#endif /* WOLFSSL_TLS13 */
|
|
|
|
|
|
#ifdef HAVE_CURVE25519
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-t Use X25519 for key exchange\n", /* 56 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#if defined(WOLFSSL_TLS13) && defined(WOLFSSL_POST_HANDSHAKE_AUTH)
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-Q Support requesting certificate post-handshake\n", /* 57 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef WOLFSSL_EARLY_DATA
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-0 Early data sent to server (0-RTT handshake)\n", /* 58 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef WOLFSSL_MULTICAST
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-3 <grpid> Multicast, grpid < 256\n", /* 59 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-1 <num> Display a result by specified language.\n"
|
2020-10-15 17:27:58 +10:00
|
|
|
|
" 0: English, 1: Japanese\n", /* 60 */
|
2019-02-20 11:23:00 -08:00
|
|
|
|
#if !defined(NO_DH) && !defined(HAVE_FIPS) && \
|
|
|
|
|
|
!defined(HAVE_SELFTEST) && !defined(WOLFSSL_OLD_PRIME_CHECK)
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-2 Disable DH Prime check\n", /* 61 */
|
2019-02-20 11:23:00 -08:00
|
|
|
|
#endif
|
2019-02-21 10:28:23 -08:00
|
|
|
|
#ifdef HAVE_SECURE_RENEGOTIATION
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-4 Use resumption for renegotiation\n", /* 62 */
|
2019-02-21 10:28:23 -08:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_TRUSTED_CA
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-5 Use Trusted CA Key Indication\n", /* 63 */
|
2020-02-19 18:07:45 +10:00
|
|
|
|
#endif
|
2020-11-02 08:23:36 -06:00
|
|
|
|
"-6 Simulate WANT_WRITE errors on every other IO send\n",
|
2020-02-19 18:07:45 +10:00
|
|
|
|
#ifdef HAVE_CURVE448
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-8 Use X448 for key exchange\n", /* 66 */
|
2020-10-06 17:16:01 -07:00
|
|
|
|
#endif
|
2021-02-15 15:47:03 +09:00
|
|
|
|
#if defined(OPENSSL_ALL) && defined(WOLFSSL_CERT_GEN) && \
|
2021-03-11 15:43:54 +09:00
|
|
|
|
(defined(WOLFSSL_CERT_REQ) || defined(WOLFSSL_CERT_EXT)) && \
|
2021-02-15 15:47:03 +09:00
|
|
|
|
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR)
|
|
|
|
|
|
"-9 Use hash dir look up for certificate loading\n"
|
|
|
|
|
|
" loading from <wolfSSL home>/certs folder\n"
|
|
|
|
|
|
" files in the folder would have the form \"hash.N\" file name\n"
|
|
|
|
|
|
" e.g symbolic link to the file at certs folder\n"
|
|
|
|
|
|
" ln -s ca-cert.pem `openssl x509 -in ca-cert.pem -hash -noout`.0\n",
|
jumbo patch of fixes for clang-tidy gripes (with some bug fixes).
defect/gripe statistics:
configured --enable-all --enable-sp-math-all --enable-intelasm
with LLVM 13 clang-tidy -checks=readability-*,bugprone-*,misc-no-recursion,misc-misplaced-const,misc-redundant-expression,misc-unused-parameters,misc-unused-using-decls,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-clang-analyzer-optin.performance.Padding,-readability-braces-around-statements,-readability-function-size,-readability-function-cognitive-complexity,-bugprone-suspicious-include,-bugprone-easily-swappable-parameters,-readability-isolate-declaration,-readability-magic-numbers,-readability-else-after-return,-bugprone-reserved-identifier,-readability-suspicious-call-argument,-bugprone-suspicious-string-compare,-bugprone-branch-clone,-misc-redundant-expression,-readability-non-const-parameter,-readability-redundant-control-flow,-readability-misleading-indentation,-bugprone-narrowing-conversions,-bugprone-implicit-widening-of-multiplication-result
[note these figures don't reflect additional defects fixed in this commit for --enable-smallstack, --enable-fips, --enable-async, --enable-asn=template, and --enable-fastmath, and --disable-fastmath]
pre-patch warning count per file, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 6 wolfssl/tests/suites.c
clang-analyzer-security.insecureAPI.strcpy 2 wolfssl/testsuite/testsuite.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/server/server.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/client/client.c
readability-redundant-preprocessor 2 wolfssl/wolfcrypt/src/asn.c
readability-redundant-preprocessor 1 wolfssl/wolfcrypt/src/rsa.c
readability-redundant-preprocessor 9 wolfssl/src/ssl.c
readability-redundant-preprocessor 2 wolfssl/src/tls13.c
readability-redundant-preprocessor 18 wolfssl/tests/api.c
readability-redundant-preprocessor 3 wolfssl/src/internal.c
readability-redundant-preprocessor 10 wolfssl/wolfcrypt/test/test.c
readability-named-parameter 1 wolfssl/wolfcrypt/benchmark/benchmark.c
readability-named-parameter 7 wolfssl/src/internal.c
readability-named-parameter 1 wolfssl/wolfcrypt/src/ecc.c
readability-named-parameter 1 wolfssl/testsuite/testsuite.c
readability-named-parameter 11 wolfssl/wolfcrypt/src/ge_operations.c
misc-no-recursion 3 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 4 wolfssl/wolfcrypt/src/asn.c
readability-uppercase-literal-suffix 1 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 13 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-too-small-loop-variable 1 wolfssl/wolfcrypt/src/rsa.c
bugprone-too-small-loop-variable 2 wolfssl/wolfcrypt/src/sha3.c
bugprone-too-small-loop-variable 4 wolfssl/wolfcrypt/src/idea.c
bugprone-signed-char-misuse 2 wolfssl/src/ssl.c
bugprone-signed-char-misuse 3 wolfssl/wolfcrypt/src/sp_int.c
bugprone-signed-char-misuse 3 wolfssl/examples/client/client.c
bugprone-macro-parentheses 19 wolfssl/wolfcrypt/src/aes.c
bugprone-macro-parentheses 109 wolfssl/wolfcrypt/src/camellia.c
bugprone-macro-parentheses 1 wolfssl/src/tls.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/md4.c
bugprone-macro-parentheses 2 wolfssl/wolfcrypt/src/asn.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2b.c
bugprone-macro-parentheses 257 wolfssl/wolfcrypt/src/sha3.c
bugprone-macro-parentheses 15 wolfssl/src/ssl.c
bugprone-macro-parentheses 1 wolfssl/wolfcrypt/src/sha.c
bugprone-macro-parentheses 8 wolfssl/tests/api.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/sp_int.c
bugprone-macro-parentheses 6 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-macro-parentheses 38 wolfssl/wolfcrypt/src/hc128.c
bugprone-macro-parentheses 12 wolfssl/wolfcrypt/src/md5.c
bugprone-macro-parentheses 10 wolfssl/wolfcrypt/src/sha256.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/test/test.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/ecc.c
bugprone-macro-parentheses 2 wolfssl/tests/suites.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/cpuid.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2s.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/sha512.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/poly1305.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/ripemd.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/src/internal.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/testsuite/testsuite.c
pre-patch warning count summaries, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-suspicious-missing-comma 6
readability-redundant-preprocessor 45
readability-named-parameter 21
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-too-small-loop-variable 7
bugprone-signed-char-misuse 8
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
pre-patch warning count summaries, without suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-branch-clone 152
readability-non-const-parameter 118
bugprone-suspicious-missing-comma 6
bugprone-suspicious-include 52
readability-magic-numbers 22423
readability-redundant-preprocessor 45
readability-named-parameter 21
readability-function-cognitive-complexity 845
readability-else-after-return 398
bugprone-implicit-widening-of-multiplication-result 595
readability-function-size 21
readability-isolate-declaration 1090
misc-redundant-expression 2
bugprone-narrowing-conversions 994
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-reserved-identifier 56
readability-suspicious-call-argument 74
bugprone-too-small-loop-variable 7
bugprone-easily-swappable-parameters 437
bugprone-signed-char-misuse 8
readability-misleading-indentation 94
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
bugprone-suspicious-string-compare 495
readability-redundant-control-flow 20
readability-braces-around-statements 11483
clang-analyzer-valist.Uninitialized 1
clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling 3502
2022-01-19 23:09:50 -06:00
|
|
|
|
/* 67 */
|
2021-06-16 00:26:48 -05:00
|
|
|
|
#endif
|
2021-06-21 15:09:39 -07:00
|
|
|
|
#if defined(WOLFSSL_WOLFSENTRY_HOOKS) && !defined(NO_FILESYSTEM) && \
|
|
|
|
|
|
!defined(WOLFSENTRY_NO_JSON)
|
2021-06-16 00:26:48 -05:00
|
|
|
|
"--wolfsentry-config <file> Path for JSON wolfSentry config\n",
|
jumbo patch of fixes for clang-tidy gripes (with some bug fixes).
defect/gripe statistics:
configured --enable-all --enable-sp-math-all --enable-intelasm
with LLVM 13 clang-tidy -checks=readability-*,bugprone-*,misc-no-recursion,misc-misplaced-const,misc-redundant-expression,misc-unused-parameters,misc-unused-using-decls,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-clang-analyzer-optin.performance.Padding,-readability-braces-around-statements,-readability-function-size,-readability-function-cognitive-complexity,-bugprone-suspicious-include,-bugprone-easily-swappable-parameters,-readability-isolate-declaration,-readability-magic-numbers,-readability-else-after-return,-bugprone-reserved-identifier,-readability-suspicious-call-argument,-bugprone-suspicious-string-compare,-bugprone-branch-clone,-misc-redundant-expression,-readability-non-const-parameter,-readability-redundant-control-flow,-readability-misleading-indentation,-bugprone-narrowing-conversions,-bugprone-implicit-widening-of-multiplication-result
[note these figures don't reflect additional defects fixed in this commit for --enable-smallstack, --enable-fips, --enable-async, --enable-asn=template, and --enable-fastmath, and --disable-fastmath]
pre-patch warning count per file, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 6 wolfssl/tests/suites.c
clang-analyzer-security.insecureAPI.strcpy 2 wolfssl/testsuite/testsuite.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/server/server.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/client/client.c
readability-redundant-preprocessor 2 wolfssl/wolfcrypt/src/asn.c
readability-redundant-preprocessor 1 wolfssl/wolfcrypt/src/rsa.c
readability-redundant-preprocessor 9 wolfssl/src/ssl.c
readability-redundant-preprocessor 2 wolfssl/src/tls13.c
readability-redundant-preprocessor 18 wolfssl/tests/api.c
readability-redundant-preprocessor 3 wolfssl/src/internal.c
readability-redundant-preprocessor 10 wolfssl/wolfcrypt/test/test.c
readability-named-parameter 1 wolfssl/wolfcrypt/benchmark/benchmark.c
readability-named-parameter 7 wolfssl/src/internal.c
readability-named-parameter 1 wolfssl/wolfcrypt/src/ecc.c
readability-named-parameter 1 wolfssl/testsuite/testsuite.c
readability-named-parameter 11 wolfssl/wolfcrypt/src/ge_operations.c
misc-no-recursion 3 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 4 wolfssl/wolfcrypt/src/asn.c
readability-uppercase-literal-suffix 1 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 13 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-too-small-loop-variable 1 wolfssl/wolfcrypt/src/rsa.c
bugprone-too-small-loop-variable 2 wolfssl/wolfcrypt/src/sha3.c
bugprone-too-small-loop-variable 4 wolfssl/wolfcrypt/src/idea.c
bugprone-signed-char-misuse 2 wolfssl/src/ssl.c
bugprone-signed-char-misuse 3 wolfssl/wolfcrypt/src/sp_int.c
bugprone-signed-char-misuse 3 wolfssl/examples/client/client.c
bugprone-macro-parentheses 19 wolfssl/wolfcrypt/src/aes.c
bugprone-macro-parentheses 109 wolfssl/wolfcrypt/src/camellia.c
bugprone-macro-parentheses 1 wolfssl/src/tls.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/md4.c
bugprone-macro-parentheses 2 wolfssl/wolfcrypt/src/asn.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2b.c
bugprone-macro-parentheses 257 wolfssl/wolfcrypt/src/sha3.c
bugprone-macro-parentheses 15 wolfssl/src/ssl.c
bugprone-macro-parentheses 1 wolfssl/wolfcrypt/src/sha.c
bugprone-macro-parentheses 8 wolfssl/tests/api.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/sp_int.c
bugprone-macro-parentheses 6 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-macro-parentheses 38 wolfssl/wolfcrypt/src/hc128.c
bugprone-macro-parentheses 12 wolfssl/wolfcrypt/src/md5.c
bugprone-macro-parentheses 10 wolfssl/wolfcrypt/src/sha256.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/test/test.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/ecc.c
bugprone-macro-parentheses 2 wolfssl/tests/suites.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/cpuid.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2s.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/sha512.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/poly1305.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/ripemd.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/src/internal.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/testsuite/testsuite.c
pre-patch warning count summaries, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-suspicious-missing-comma 6
readability-redundant-preprocessor 45
readability-named-parameter 21
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-too-small-loop-variable 7
bugprone-signed-char-misuse 8
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
pre-patch warning count summaries, without suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-branch-clone 152
readability-non-const-parameter 118
bugprone-suspicious-missing-comma 6
bugprone-suspicious-include 52
readability-magic-numbers 22423
readability-redundant-preprocessor 45
readability-named-parameter 21
readability-function-cognitive-complexity 845
readability-else-after-return 398
bugprone-implicit-widening-of-multiplication-result 595
readability-function-size 21
readability-isolate-declaration 1090
misc-redundant-expression 2
bugprone-narrowing-conversions 994
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-reserved-identifier 56
readability-suspicious-call-argument 74
bugprone-too-small-loop-variable 7
bugprone-easily-swappable-parameters 437
bugprone-signed-char-misuse 8
readability-misleading-indentation 94
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
bugprone-suspicious-string-compare 495
readability-redundant-control-flow 20
readability-braces-around-statements 11483
clang-analyzer-valist.Uninitialized 1
clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling 3502
2022-01-19 23:09:50 -06:00
|
|
|
|
/* 68 */
|
2021-05-14 14:37:04 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifndef WOLFSSL_TLS13
|
|
|
|
|
|
"-7 Set minimum downgrade protocol version [0-3] "
|
|
|
|
|
|
" SSLv3(0) - TLS1.2(3)\n",
|
|
|
|
|
|
#else
|
|
|
|
|
|
"-7 Set minimum downgrade protocol version [0-4] "
|
jumbo patch of fixes for clang-tidy gripes (with some bug fixes).
defect/gripe statistics:
configured --enable-all --enable-sp-math-all --enable-intelasm
with LLVM 13 clang-tidy -checks=readability-*,bugprone-*,misc-no-recursion,misc-misplaced-const,misc-redundant-expression,misc-unused-parameters,misc-unused-using-decls,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-clang-analyzer-optin.performance.Padding,-readability-braces-around-statements,-readability-function-size,-readability-function-cognitive-complexity,-bugprone-suspicious-include,-bugprone-easily-swappable-parameters,-readability-isolate-declaration,-readability-magic-numbers,-readability-else-after-return,-bugprone-reserved-identifier,-readability-suspicious-call-argument,-bugprone-suspicious-string-compare,-bugprone-branch-clone,-misc-redundant-expression,-readability-non-const-parameter,-readability-redundant-control-flow,-readability-misleading-indentation,-bugprone-narrowing-conversions,-bugprone-implicit-widening-of-multiplication-result
[note these figures don't reflect additional defects fixed in this commit for --enable-smallstack, --enable-fips, --enable-async, --enable-asn=template, and --enable-fastmath, and --disable-fastmath]
pre-patch warning count per file, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 6 wolfssl/tests/suites.c
clang-analyzer-security.insecureAPI.strcpy 2 wolfssl/testsuite/testsuite.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/server/server.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/client/client.c
readability-redundant-preprocessor 2 wolfssl/wolfcrypt/src/asn.c
readability-redundant-preprocessor 1 wolfssl/wolfcrypt/src/rsa.c
readability-redundant-preprocessor 9 wolfssl/src/ssl.c
readability-redundant-preprocessor 2 wolfssl/src/tls13.c
readability-redundant-preprocessor 18 wolfssl/tests/api.c
readability-redundant-preprocessor 3 wolfssl/src/internal.c
readability-redundant-preprocessor 10 wolfssl/wolfcrypt/test/test.c
readability-named-parameter 1 wolfssl/wolfcrypt/benchmark/benchmark.c
readability-named-parameter 7 wolfssl/src/internal.c
readability-named-parameter 1 wolfssl/wolfcrypt/src/ecc.c
readability-named-parameter 1 wolfssl/testsuite/testsuite.c
readability-named-parameter 11 wolfssl/wolfcrypt/src/ge_operations.c
misc-no-recursion 3 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 4 wolfssl/wolfcrypt/src/asn.c
readability-uppercase-literal-suffix 1 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 13 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-too-small-loop-variable 1 wolfssl/wolfcrypt/src/rsa.c
bugprone-too-small-loop-variable 2 wolfssl/wolfcrypt/src/sha3.c
bugprone-too-small-loop-variable 4 wolfssl/wolfcrypt/src/idea.c
bugprone-signed-char-misuse 2 wolfssl/src/ssl.c
bugprone-signed-char-misuse 3 wolfssl/wolfcrypt/src/sp_int.c
bugprone-signed-char-misuse 3 wolfssl/examples/client/client.c
bugprone-macro-parentheses 19 wolfssl/wolfcrypt/src/aes.c
bugprone-macro-parentheses 109 wolfssl/wolfcrypt/src/camellia.c
bugprone-macro-parentheses 1 wolfssl/src/tls.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/md4.c
bugprone-macro-parentheses 2 wolfssl/wolfcrypt/src/asn.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2b.c
bugprone-macro-parentheses 257 wolfssl/wolfcrypt/src/sha3.c
bugprone-macro-parentheses 15 wolfssl/src/ssl.c
bugprone-macro-parentheses 1 wolfssl/wolfcrypt/src/sha.c
bugprone-macro-parentheses 8 wolfssl/tests/api.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/sp_int.c
bugprone-macro-parentheses 6 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-macro-parentheses 38 wolfssl/wolfcrypt/src/hc128.c
bugprone-macro-parentheses 12 wolfssl/wolfcrypt/src/md5.c
bugprone-macro-parentheses 10 wolfssl/wolfcrypt/src/sha256.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/test/test.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/ecc.c
bugprone-macro-parentheses 2 wolfssl/tests/suites.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/cpuid.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2s.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/sha512.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/poly1305.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/ripemd.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/src/internal.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/testsuite/testsuite.c
pre-patch warning count summaries, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-suspicious-missing-comma 6
readability-redundant-preprocessor 45
readability-named-parameter 21
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-too-small-loop-variable 7
bugprone-signed-char-misuse 8
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
pre-patch warning count summaries, without suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-branch-clone 152
readability-non-const-parameter 118
bugprone-suspicious-missing-comma 6
bugprone-suspicious-include 52
readability-magic-numbers 22423
readability-redundant-preprocessor 45
readability-named-parameter 21
readability-function-cognitive-complexity 845
readability-else-after-return 398
bugprone-implicit-widening-of-multiplication-result 595
readability-function-size 21
readability-isolate-declaration 1090
misc-redundant-expression 2
bugprone-narrowing-conversions 994
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-reserved-identifier 56
readability-suspicious-call-argument 74
bugprone-too-small-loop-variable 7
bugprone-easily-swappable-parameters 437
bugprone-signed-char-misuse 8
readability-misleading-indentation 94
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
bugprone-suspicious-string-compare 495
readability-redundant-control-flow 20
readability-braces-around-statements 11483
clang-analyzer-valist.Uninitialized 1
clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling 3502
2022-01-19 23:09:50 -06:00
|
|
|
|
" SSLv3(0) - TLS1.3(4)\n", /* 69 */
|
2021-04-28 10:28:35 -07:00
|
|
|
|
#endif
|
2021-12-20 11:26:25 -05:00
|
|
|
|
#ifdef HAVE_PQC
|
2022-08-18 12:32:58 -05:00
|
|
|
|
"--pqc <alg> Key Share with specified post-quantum algorithm only [KYBER_LEVEL1, KYBER_LEVEL3,\n"
|
2022-11-30 17:17:28 -05:00
|
|
|
|
" KYBER_LEVEL5, P256_KYBER_LEVEL1, P384_KYBER_LEVEL3, P521_KYBER_LEVEL5]\n", /* 70 */
|
2019-02-21 10:28:23 -08:00
|
|
|
|
#endif
|
2022-01-14 13:43:29 -08:00
|
|
|
|
#ifdef WOLFSSL_SRTP
|
jumbo patch of fixes for clang-tidy gripes (with some bug fixes).
defect/gripe statistics:
configured --enable-all --enable-sp-math-all --enable-intelasm
with LLVM 13 clang-tidy -checks=readability-*,bugprone-*,misc-no-recursion,misc-misplaced-const,misc-redundant-expression,misc-unused-parameters,misc-unused-using-decls,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-clang-analyzer-optin.performance.Padding,-readability-braces-around-statements,-readability-function-size,-readability-function-cognitive-complexity,-bugprone-suspicious-include,-bugprone-easily-swappable-parameters,-readability-isolate-declaration,-readability-magic-numbers,-readability-else-after-return,-bugprone-reserved-identifier,-readability-suspicious-call-argument,-bugprone-suspicious-string-compare,-bugprone-branch-clone,-misc-redundant-expression,-readability-non-const-parameter,-readability-redundant-control-flow,-readability-misleading-indentation,-bugprone-narrowing-conversions,-bugprone-implicit-widening-of-multiplication-result
[note these figures don't reflect additional defects fixed in this commit for --enable-smallstack, --enable-fips, --enable-async, --enable-asn=template, and --enable-fastmath, and --disable-fastmath]
pre-patch warning count per file, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 6 wolfssl/tests/suites.c
clang-analyzer-security.insecureAPI.strcpy 2 wolfssl/testsuite/testsuite.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/server/server.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/client/client.c
readability-redundant-preprocessor 2 wolfssl/wolfcrypt/src/asn.c
readability-redundant-preprocessor 1 wolfssl/wolfcrypt/src/rsa.c
readability-redundant-preprocessor 9 wolfssl/src/ssl.c
readability-redundant-preprocessor 2 wolfssl/src/tls13.c
readability-redundant-preprocessor 18 wolfssl/tests/api.c
readability-redundant-preprocessor 3 wolfssl/src/internal.c
readability-redundant-preprocessor 10 wolfssl/wolfcrypt/test/test.c
readability-named-parameter 1 wolfssl/wolfcrypt/benchmark/benchmark.c
readability-named-parameter 7 wolfssl/src/internal.c
readability-named-parameter 1 wolfssl/wolfcrypt/src/ecc.c
readability-named-parameter 1 wolfssl/testsuite/testsuite.c
readability-named-parameter 11 wolfssl/wolfcrypt/src/ge_operations.c
misc-no-recursion 3 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 4 wolfssl/wolfcrypt/src/asn.c
readability-uppercase-literal-suffix 1 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 13 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-too-small-loop-variable 1 wolfssl/wolfcrypt/src/rsa.c
bugprone-too-small-loop-variable 2 wolfssl/wolfcrypt/src/sha3.c
bugprone-too-small-loop-variable 4 wolfssl/wolfcrypt/src/idea.c
bugprone-signed-char-misuse 2 wolfssl/src/ssl.c
bugprone-signed-char-misuse 3 wolfssl/wolfcrypt/src/sp_int.c
bugprone-signed-char-misuse 3 wolfssl/examples/client/client.c
bugprone-macro-parentheses 19 wolfssl/wolfcrypt/src/aes.c
bugprone-macro-parentheses 109 wolfssl/wolfcrypt/src/camellia.c
bugprone-macro-parentheses 1 wolfssl/src/tls.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/md4.c
bugprone-macro-parentheses 2 wolfssl/wolfcrypt/src/asn.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2b.c
bugprone-macro-parentheses 257 wolfssl/wolfcrypt/src/sha3.c
bugprone-macro-parentheses 15 wolfssl/src/ssl.c
bugprone-macro-parentheses 1 wolfssl/wolfcrypt/src/sha.c
bugprone-macro-parentheses 8 wolfssl/tests/api.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/sp_int.c
bugprone-macro-parentheses 6 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-macro-parentheses 38 wolfssl/wolfcrypt/src/hc128.c
bugprone-macro-parentheses 12 wolfssl/wolfcrypt/src/md5.c
bugprone-macro-parentheses 10 wolfssl/wolfcrypt/src/sha256.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/test/test.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/ecc.c
bugprone-macro-parentheses 2 wolfssl/tests/suites.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/cpuid.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2s.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/sha512.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/poly1305.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/ripemd.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/src/internal.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/testsuite/testsuite.c
pre-patch warning count summaries, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-suspicious-missing-comma 6
readability-redundant-preprocessor 45
readability-named-parameter 21
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-too-small-loop-variable 7
bugprone-signed-char-misuse 8
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
pre-patch warning count summaries, without suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-branch-clone 152
readability-non-const-parameter 118
bugprone-suspicious-missing-comma 6
bugprone-suspicious-include 52
readability-magic-numbers 22423
readability-redundant-preprocessor 45
readability-named-parameter 21
readability-function-cognitive-complexity 845
readability-else-after-return 398
bugprone-implicit-widening-of-multiplication-result 595
readability-function-size 21
readability-isolate-declaration 1090
misc-redundant-expression 2
bugprone-narrowing-conversions 994
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-reserved-identifier 56
readability-suspicious-call-argument 74
bugprone-too-small-loop-variable 7
bugprone-easily-swappable-parameters 437
bugprone-signed-char-misuse 8
readability-misleading-indentation 94
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
bugprone-suspicious-string-compare 495
readability-redundant-control-flow 20
readability-braces-around-statements 11483
clang-analyzer-valist.Uninitialized 1
clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling 3502
2022-01-19 23:09:50 -06:00
|
|
|
|
"--srtp <profile> (default is SRTP_AES128_CM_SHA1_80)\n", /* 71 */
|
2022-09-30 10:02:56 -07:00
|
|
|
|
#endif
|
2022-10-07 11:19:34 -07:00
|
|
|
|
#ifdef WOLFSSL_SYS_CA_CERTS
|
2022-09-30 10:02:56 -07:00
|
|
|
|
"--sys-ca-certs Load system CA certs for server cert verification\n", /* 72 */
|
2023-01-24 12:00:37 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_SUPPORTED_CURVES
|
|
|
|
|
|
"--onlyPskDheKe Must use DHE key exchange with PSK\n", /* 73 */
|
2023-04-24 17:03:34 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifndef NO_PSK
|
2023-05-05 08:43:50 +10:00
|
|
|
|
"--openssl-psk Use TLS 1.3 PSK callback compatible with OpenSSL\n", /* 74 */
|
2022-01-13 16:09:11 -08:00
|
|
|
|
#endif
|
|
|
|
|
|
"\n"
|
jumbo patch of fixes for clang-tidy gripes (with some bug fixes).
defect/gripe statistics:
configured --enable-all --enable-sp-math-all --enable-intelasm
with LLVM 13 clang-tidy -checks=readability-*,bugprone-*,misc-no-recursion,misc-misplaced-const,misc-redundant-expression,misc-unused-parameters,misc-unused-using-decls,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-clang-analyzer-optin.performance.Padding,-readability-braces-around-statements,-readability-function-size,-readability-function-cognitive-complexity,-bugprone-suspicious-include,-bugprone-easily-swappable-parameters,-readability-isolate-declaration,-readability-magic-numbers,-readability-else-after-return,-bugprone-reserved-identifier,-readability-suspicious-call-argument,-bugprone-suspicious-string-compare,-bugprone-branch-clone,-misc-redundant-expression,-readability-non-const-parameter,-readability-redundant-control-flow,-readability-misleading-indentation,-bugprone-narrowing-conversions,-bugprone-implicit-widening-of-multiplication-result
[note these figures don't reflect additional defects fixed in this commit for --enable-smallstack, --enable-fips, --enable-async, --enable-asn=template, and --enable-fastmath, and --disable-fastmath]
pre-patch warning count per file, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 6 wolfssl/tests/suites.c
clang-analyzer-security.insecureAPI.strcpy 2 wolfssl/testsuite/testsuite.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/server/server.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/client/client.c
readability-redundant-preprocessor 2 wolfssl/wolfcrypt/src/asn.c
readability-redundant-preprocessor 1 wolfssl/wolfcrypt/src/rsa.c
readability-redundant-preprocessor 9 wolfssl/src/ssl.c
readability-redundant-preprocessor 2 wolfssl/src/tls13.c
readability-redundant-preprocessor 18 wolfssl/tests/api.c
readability-redundant-preprocessor 3 wolfssl/src/internal.c
readability-redundant-preprocessor 10 wolfssl/wolfcrypt/test/test.c
readability-named-parameter 1 wolfssl/wolfcrypt/benchmark/benchmark.c
readability-named-parameter 7 wolfssl/src/internal.c
readability-named-parameter 1 wolfssl/wolfcrypt/src/ecc.c
readability-named-parameter 1 wolfssl/testsuite/testsuite.c
readability-named-parameter 11 wolfssl/wolfcrypt/src/ge_operations.c
misc-no-recursion 3 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 4 wolfssl/wolfcrypt/src/asn.c
readability-uppercase-literal-suffix 1 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 13 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-too-small-loop-variable 1 wolfssl/wolfcrypt/src/rsa.c
bugprone-too-small-loop-variable 2 wolfssl/wolfcrypt/src/sha3.c
bugprone-too-small-loop-variable 4 wolfssl/wolfcrypt/src/idea.c
bugprone-signed-char-misuse 2 wolfssl/src/ssl.c
bugprone-signed-char-misuse 3 wolfssl/wolfcrypt/src/sp_int.c
bugprone-signed-char-misuse 3 wolfssl/examples/client/client.c
bugprone-macro-parentheses 19 wolfssl/wolfcrypt/src/aes.c
bugprone-macro-parentheses 109 wolfssl/wolfcrypt/src/camellia.c
bugprone-macro-parentheses 1 wolfssl/src/tls.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/md4.c
bugprone-macro-parentheses 2 wolfssl/wolfcrypt/src/asn.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2b.c
bugprone-macro-parentheses 257 wolfssl/wolfcrypt/src/sha3.c
bugprone-macro-parentheses 15 wolfssl/src/ssl.c
bugprone-macro-parentheses 1 wolfssl/wolfcrypt/src/sha.c
bugprone-macro-parentheses 8 wolfssl/tests/api.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/sp_int.c
bugprone-macro-parentheses 6 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-macro-parentheses 38 wolfssl/wolfcrypt/src/hc128.c
bugprone-macro-parentheses 12 wolfssl/wolfcrypt/src/md5.c
bugprone-macro-parentheses 10 wolfssl/wolfcrypt/src/sha256.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/test/test.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/ecc.c
bugprone-macro-parentheses 2 wolfssl/tests/suites.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/cpuid.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2s.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/sha512.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/poly1305.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/ripemd.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/src/internal.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/testsuite/testsuite.c
pre-patch warning count summaries, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-suspicious-missing-comma 6
readability-redundant-preprocessor 45
readability-named-parameter 21
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-too-small-loop-variable 7
bugprone-signed-char-misuse 8
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
pre-patch warning count summaries, without suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-branch-clone 152
readability-non-const-parameter 118
bugprone-suspicious-missing-comma 6
bugprone-suspicious-include 52
readability-magic-numbers 22423
readability-redundant-preprocessor 45
readability-named-parameter 21
readability-function-cognitive-complexity 845
readability-else-after-return 398
bugprone-implicit-widening-of-multiplication-result 595
readability-function-size 21
readability-isolate-declaration 1090
misc-redundant-expression 2
bugprone-narrowing-conversions 994
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-reserved-identifier 56
readability-suspicious-call-argument 74
bugprone-too-small-loop-variable 7
bugprone-easily-swappable-parameters 437
bugprone-signed-char-misuse 8
readability-misleading-indentation 94
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
bugprone-suspicious-string-compare 495
readability-redundant-control-flow 20
readability-braces-around-statements 11483
clang-analyzer-valist.Uninitialized 1
clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling 3502
2022-01-19 23:09:50 -06:00
|
|
|
|
"For simpler wolfSSL TLS client examples, visit\n"
|
2023-04-24 17:03:34 +10:00
|
|
|
|
"https://github.com/wolfSSL/wolfssl-examples/tree/master/tls\n", /* 75 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
NULL,
|
|
|
|
|
|
},
|
2018-11-29 07:04:01 +09:00
|
|
|
|
#ifndef NO_MULTIBYTE_PRINT
|
2018-10-20 13:40:01 +09:00
|
|
|
|
/* Japanese */
|
2018-11-29 06:52:43 +09:00
|
|
|
|
{
|
2018-10-20 17:15:17 +09:00
|
|
|
|
" 注意 : 全てのファイルは wolfSSL ホーム・ディレクトリからの相対です。"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"\n", /* 0 */
|
|
|
|
|
|
"RSAの最大ビットは次のように設定されています: ", /* 1 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifdef NO_RSA
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"RSAはサポートされていません。\n", /* 2 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#elif defined(WOLFSSL_SP_MATH) /* case of SP math only */
|
|
|
|
|
|
#ifndef WOLFSSL_SP_NO_3072
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"3072\n", /* 2 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#elif !defined(WOLFSSL_SP_NO_2048)
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"2048\n", /* 2 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#else
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"0\n", /* 2 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#elif defined(USE_FAST_MATH)
|
|
|
|
|
|
#else
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"無限\n", /* 2 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-? <num> ヘルプ, 使い方を表示\n"
|
2021-06-16 00:26:48 -05:00
|
|
|
|
" 0: 英語、 1: 日本語\n"
|
2022-06-22 16:46:19 +09:00
|
|
|
|
"--ヘルプ 日本語で使い方を表示\n", /* 3 */
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-h <host> 接続先ホスト, 既定値", /* 4 */
|
|
|
|
|
|
"-p <num> 接続先ポート, 0は無効, 既定値", /* 5 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
|
|
|
|
|
|
#ifndef WOLFSSL_TLS13
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-v <num> SSL バージョン [0-3], SSLv3(0) - TLS1.2(3)),"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
" 既定値", /* 6 */
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-V 有効な ssl バージョン番号を出力, SSLv3(0) -"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
" TLS1.2(3)\n", /* 7 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#else
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-v <num> SSL バージョン [0-4], SSLv3(0) - TLS1.3(4)),"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
" 既定値", /* 6 */
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-V 有効な ssl バージョン番号を出力, SSLv3(0) -"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
" TLS1.3(4)\n", /* 7 */
|
2018-10-20 17:15:17 +09:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-l <str> 暗号スイートリスト (区切り文字 :)\n", /* 8 */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#ifndef NO_CERTS
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-c <file> 証明書ファイル, 既定値", /* 9 */
|
|
|
|
|
|
"-k <file> 鍵ファイル, 既定値", /* 10 */
|
|
|
|
|
|
"-A <file> 認証局ファイル, 既定値", /* 11 */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#endif
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifndef NO_DH
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-Z <num> 最小 DH 鍵 ビット, 既定値", /* 12 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-b <num> ベンチマーク <num> 接続及び結果出力する\n", /* 13 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifdef HAVE_ALPN
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-L <str> アプリケーション層プロトコルネゴシエーションを行う"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
" ({C,F}:<list>)\n", /* 14 */
|
2018-10-20 17:15:17 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
"-B <num> <num> バイトを用いてのベンチマーク・スループット測定"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"と結果を出力する\n", /* 15 */
|
2020-08-25 11:26:53 +10:00
|
|
|
|
#ifndef NO_PSK
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-s 事前共有鍵を使用する\n", /* 16 */
|
2020-08-25 11:26:53 +10:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-d ピア確認を無効とする\n", /* 17 */
|
|
|
|
|
|
"-D 日付エラー用コールバック例の上書きを行う\n", /* 18 */
|
|
|
|
|
|
"-e 利用可能な全ての暗号スイートをリスト, \n", /* 19 */
|
|
|
|
|
|
"-g サーバーへ HTTP GET を送信\n", /* 20 */
|
2022-06-22 16:46:19 +09:00
|
|
|
|
"-u UDP DTLSを使用する。\n"
|
|
|
|
|
|
#ifndef WOLFSSL_DTLS13
|
|
|
|
|
|
" -v 2 を追加指定するとDTLSv1, "
|
|
|
|
|
|
"-v 3 を追加指定すると DTLSv1.2 (既定値)\n", /* 21 */
|
|
|
|
|
|
#else
|
|
|
|
|
|
" -v 2 を追加指定するとDTLSv1, "
|
|
|
|
|
|
"-v 3 を追加指定すると DTLSv1.2 (既定値),\n"
|
|
|
|
|
|
" -v 4 を追加指定すると DTLSv1.3\n", /* 21 */
|
|
|
|
|
|
#endif /* !WOLFSSL_DTLS13 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifdef WOLFSSL_SCTP
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-G SCTP DTLSを使用する。-v 2 を追加指定すると"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
" DTLSv1, -v 3 を追加指定すると DTLSv1.2 (既定値)\n", /* 22 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#ifndef NO_CERTS
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-m 証明書内のドメイン名一致を確認する\n", /* 23 */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-N ノンブロッキング・ソケットを使用する\n", /* 24 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifndef NO_SESSION_CACHE
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-r セッションを継続する\n", /* 25 */
|
2019-01-10 17:12:37 -08:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-w 双方向シャットダウンを待つ\n", /* 26 */
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-M <prot> STARTTLSを使用する, <prot>プロトコル(smtp)を"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"使用する\n", /* 27 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifdef HAVE_SECURE_RENEGOTIATION
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-R セキュアな再ネゴシエーションを許可する\n", /* 28 */
|
2020-09-30 13:46:23 +02:00
|
|
|
|
"-i <str> クライアント主導のネゴシエーションを強制する\n", /* 29 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-f より少ないパケット/グループメッセージを使用する\n",/* 30 */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#ifndef NO_CERTS
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-x クライアントの証明書/鍵のロードを無効する\n", /* 31 */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-X 外部テスト・ケースにより動作する\n", /* 32 */
|
|
|
|
|
|
"-j コールバック・オーバーライドの検証を使用する\n", /* 33 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifdef SHOW_SIZES
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-z 構造体のサイズを表示する\n", /* 34 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_SNI
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-S <str> ホスト名表示を使用する\n", /* 35 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_MAX_FRAGMENT
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-F <num> 最大フラグメント長[1-6]を設定する\n", /* 36 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_TRUNCATED_HMAC
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-T Truncated HMACを使用する\n", /* 37 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_EXTENDED_MASTER
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-n マスターシークレット拡張を無効にする\n", /* 38 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_OCSP
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"-o OCSPルックアップをピア証明書で実施する\n", /* 39 */
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-O <url> OCSPルックアップを、<url>を使用し"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
"応答者として実施する\n", /* 40 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#if defined(HAVE_CERTIFICATE_STATUS_REQUEST) \
|
|
|
|
|
|
|| defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2)
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-W <num> OCSP Staplingを使用する"
|
2018-11-29 06:52:43 +09:00
|
|
|
|
" (1 v1, 2 v2, 3 v2 multi)\n", /* 41 */
|
2022-06-22 16:46:19 +09:00
|
|
|
|
" 'm' を最後に指定すると必ず staple を使用する\n" /* 42 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
2019-08-22 09:33:38 +10:00
|
|
|
|
#if defined(ATOMIC_USER) && !defined(WOLFSSL_AEAD_ONLY)
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-U アトミック・ユーザー記録の"
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"コールバックを利用する\n", /* 43 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_PK_CALLBACKS
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-P 公開鍵コールバック\n", /* 44 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_ANON
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-a 匿名クライアント\n", /* 45 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_CRL
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-C CRLを無効\n", /* 46 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef WOLFSSL_TRUST_PEER_CERT
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-E <file> 信頼出来るピアの証明書ロードの為のパス\n", /* 47 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_WNR
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-q <file> Whitewood コンフィグファイル, 既定値\n", /* 48 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-H <arg> 内部テスト"
|
2022-06-22 16:46:19 +09:00
|
|
|
|
" [defCipherList, exitWithRet, verifyFail, useSupCurve,\n", /* 49 */
|
2020-10-15 17:27:58 +10:00
|
|
|
|
" loadSSL, disallowETM]\n", /* 50 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifdef WOLFSSL_TLS13
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-J HelloRetryRequestをKEのグループ選択に使用する\n", /* 51 */
|
|
|
|
|
|
"-K 鍵交換にPSKを使用、(EC)DHEは使用しない\n", /* 52 */
|
|
|
|
|
|
"-I データ送信前に、鍵とIVを更新する\n", /* 53 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#ifndef NO_DH
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-y FFDHE名前付きグループとの鍵共有のみ\n", /* 54 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_ECC
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-Y ECC名前付きグループとの鍵共有のみ\n", /* 55 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#endif /* WOLFSSL_TLS13 */
|
|
|
|
|
|
#ifdef HAVE_CURVE25519
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-t X25519を鍵交換に使用する\n", /* 56 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#if defined(WOLFSSL_TLS13) && defined(WOLFSSL_POST_HANDSHAKE_AUTH)
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-Q ポストハンドシェークの証明要求をサポートする\n", /* 57 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef WOLFSSL_EARLY_DATA
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-0 Early data をサーバーへ送信する"
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"（0-RTTハンドシェイク）\n", /* 58 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef WOLFSSL_MULTICAST
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-3 <grpid> マルチキャスト, grpid < 256\n", /* 59 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
#endif
|
2018-10-20 17:15:17 +09:00
|
|
|
|
"-1 <num> 指定された言語で結果を表示します。\n"
|
2020-10-15 17:27:58 +10:00
|
|
|
|
" 0: 英語、 1: 日本語\n", /* 60 */
|
2019-02-20 11:23:00 -08:00
|
|
|
|
#if !defined(NO_DH) && !defined(HAVE_FIPS) && \
|
|
|
|
|
|
!defined(HAVE_SELFTEST) && !defined(WOLFSSL_OLD_PRIME_CHECK)
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-2 DHプライム番号チェックを無効にする\n", /* 61 */
|
2019-02-20 11:23:00 -08:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_SECURE_RENEGOTIATION
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-4 再交渉に再開を使用\n", /* 62 */
|
2019-02-21 10:28:23 -08:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_TRUSTED_CA
|
2020-10-15 17:27:58 +10:00
|
|
|
|
"-5 信頼できる認証局の鍵表示を使用する\n", /* 63 */
|
2020-02-19 18:07:45 +10:00
|
|
|
|
#endif
|
2023-05-23 07:11:53 +09:00
|
|
|
|
"-6 WANT_WRITE エラーを全てのIO 送信でシミュレートします\n",
|
2020-02-19 18:07:45 +10:00
|
|
|
|
#ifdef HAVE_CURVE448
|
2022-06-22 16:46:19 +09:00
|
|
|
|
"-8 鍵交換に X448 を使用する\n", /* 66 */
|
2021-02-15 15:47:03 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#if defined(OPENSSL_ALL) && defined(WOLFSSL_CERT_GEN) && \
|
2021-03-11 15:43:54 +09:00
|
|
|
|
(defined(WOLFSSL_CERT_REQ) || defined(WOLFSSL_CERT_EXT)) && \
|
2021-02-15 15:47:03 +09:00
|
|
|
|
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR)
|
|
|
|
|
|
"-9 証明書の読み込みに hash dir 機能を使用する\n"
|
|
|
|
|
|
" <wolfSSL home>/certs フォルダーからロードします\n"
|
|
|
|
|
|
" フォルダー中のファイルは、\"hash.N\"[N:0-9]名である必要があります\n"
|
|
|
|
|
|
" 以下の例ではca-cert.pemにシンボリックリンクを設定します\n"
|
|
|
|
|
|
" ln -s ca-cert.pem `openssl x509 -in ca-cert.pem -hash -noout`.0\n",
|
|
|
|
|
|
/* 67 */
|
2021-06-16 00:26:48 -05:00
|
|
|
|
#endif
|
2021-06-21 15:09:39 -07:00
|
|
|
|
#if defined(WOLFSSL_WOLFSENTRY_HOOKS) && !defined(NO_FILESYSTEM) && \
|
|
|
|
|
|
!defined(WOLFSENTRY_NO_JSON)
|
2021-06-16 00:26:48 -05:00
|
|
|
|
"--wolfsentry-config <file> wolfSentry コンフィグファイル\n",
|
2021-05-14 14:37:04 +09:00
|
|
|
|
/* 68 */
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#ifndef WOLFSSL_TLS13
|
|
|
|
|
|
"-7 最小ダウングレード可能なプロトコルバージョンを設定します [0-3] "
|
|
|
|
|
|
" SSLv3(0) - TLS1.2(3)\n",
|
|
|
|
|
|
#else
|
|
|
|
|
|
"-7 最小ダウングレード可能なプロトコルバージョンを設定します [0-4] "
|
2021-04-28 10:28:35 -07:00
|
|
|
|
" SSLv3(0) - TLS1.3(4)\n", /* 69 */
|
|
|
|
|
|
#endif
|
2021-12-20 11:26:25 -05:00
|
|
|
|
#ifdef HAVE_PQC
|
2022-08-18 12:32:58 -05:00
|
|
|
|
"--pqc <alg> post-quantum 名前付きグループとの鍵共有のみ [KYBER_LEVEL1, KYBER_LEVEL3,\n"
|
2022-11-30 17:17:28 -05:00
|
|
|
|
" KYBER_LEVEL5, P256_KYBER_LEVEL1, P384_KYBER_LEVEL3, P521_KYBER_LEVEL5]\n", /* 70 */
|
2022-01-13 16:09:11 -08:00
|
|
|
|
#endif
|
2022-01-14 13:43:29 -08:00
|
|
|
|
#ifdef WOLFSSL_SRTP
|
2022-06-22 16:46:19 +09:00
|
|
|
|
"--srtp <profile> (デフォルトは SRTP_AES128_CM_SHA1_80)\n", /* 71 */
|
2023-01-24 12:00:37 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef WOLFSSL_SYS_CA_CERTS
|
|
|
|
|
|
"--sys-ca-certs Load system CA certs for server cert verification\n", /* 72 */
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_SUPPORTED_CURVES
|
|
|
|
|
|
"--onlyPskDheKe Must use DHE key exchange with PSK\n", /* 73 */
|
2023-04-24 17:03:34 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifndef NO_PSK
|
2023-05-05 08:43:50 +10:00
|
|
|
|
"--openssl-psk Use TLS 1.3 PSK callback compatible with OpenSSL\n", /* 74 */
|
2019-02-20 11:23:00 -08:00
|
|
|
|
#endif
|
2022-01-13 16:09:11 -08:00
|
|
|
|
"\n"
|
2023-05-23 07:11:53 +09:00
|
|
|
|
"より簡単なwolfSSL TLS クライアントの例については"
|
2022-06-22 16:46:19 +09:00
|
|
|
|
"下記にアクセスしてください\n"
|
2023-04-24 17:03:34 +10:00
|
|
|
|
"https://github.com/wolfSSL/wolfssl-examples/tree/master/tls\n", /* 75 */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
NULL,
|
|
|
|
|
|
},
|
2018-11-26 08:11:31 +09:00
|
|
|
|
#endif
|
2018-11-29 06:52:43 +09:00
|
|
|
|
|
2018-10-20 13:40:01 +09:00
|
|
|
|
};
|
|
|
|
|
|
|
2021-12-07 14:07:47 -07:00
|
|
|
|
static void showPeerPEM(WOLFSSL* ssl)
|
|
|
|
|
|
{
|
2021-12-08 13:45:37 -07:00
|
|
|
|
#if defined(OPENSSL_ALL) && !defined(NO_BIO) && defined(WOLFSSL_CERT_GEN)
|
2021-12-07 14:07:47 -07:00
|
|
|
|
WOLFSSL_X509* peer = wolfSSL_get_peer_certificate(ssl);
|
|
|
|
|
|
if (peer) {
|
|
|
|
|
|
WOLFSSL_BIO* bioOut = wolfSSL_BIO_new(wolfSSL_BIO_s_file());
|
|
|
|
|
|
if (bioOut == NULL) {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "failed to get bio on stdout\n");
|
2021-12-07 14:07:47 -07:00
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
if (wolfSSL_BIO_set_fp(bioOut, stdout, BIO_NOCLOSE)
|
|
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "failed to set stdout to bio output\n");
|
2021-12-07 14:07:47 -07:00
|
|
|
|
wolfSSL_BIO_free(bioOut);
|
|
|
|
|
|
bioOut = NULL;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (bioOut) {
|
|
|
|
|
|
wolfSSL_BIO_write(bioOut, "---\nServer certificate\n",
|
|
|
|
|
|
XSTRLEN("---\nServer certificate\n"));
|
|
|
|
|
|
wolfSSL_PEM_write_bio_X509(bioOut, peer);
|
|
|
|
|
|
}
|
|
|
|
|
|
wolfSSL_BIO_free(bioOut);
|
|
|
|
|
|
}
|
|
|
|
|
|
wolfSSL_FreeX509(peer);
|
2021-12-08 13:45:37 -07:00
|
|
|
|
#endif /* OPENSSL_ALL && WOLFSSL_CERT_GEN && !NO_BIO */
|
2021-12-07 14:07:47 -07:00
|
|
|
|
(void)ssl;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-08-01 12:55:13 -07:00
|
|
|
|
static void Usage(void)
|
|
|
|
|
|
{
|
2018-10-20 13:40:01 +09:00
|
|
|
|
int msgid = 0;
|
|
|
|
|
|
const char** msg = client_usage_msg[lng_index];
|
|
|
|
|
|
|
|
|
|
|
|
printf("%s%s%s", "wolfSSL client ", LIBWOLFSSL_VERSION_STRING,
|
|
|
|
|
|
msg[msgid]);
|
2018-08-08 15:16:32 -06:00
|
|
|
|
|
|
|
|
|
|
/* print out so that scripts can know what the max supported key size is */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]);
|
2018-08-15 09:50:50 -06:00
|
|
|
|
#ifdef NO_RSA
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]);
|
2018-08-15 09:50:50 -06:00
|
|
|
|
#elif defined(WOLFSSL_SP_MATH) /* case of SP math only */
|
|
|
|
|
|
#ifndef WOLFSSL_SP_NO_3072
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]);
|
2018-08-15 09:50:50 -06:00
|
|
|
|
#elif !defined(WOLFSSL_SP_NO_2048)
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]);
|
2018-08-15 09:50:50 -06:00
|
|
|
|
#else
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]);
|
2018-08-15 09:50:50 -06:00
|
|
|
|
#endif
|
|
|
|
|
|
#elif defined(USE_FAST_MATH)
|
2020-01-06 15:23:45 +10:00
|
|
|
|
#if !defined(WOLFSSL_SP_MATH_ALL) && !defined(WOLFSSL_SP_MATH)
|
2018-08-08 15:16:32 -06:00
|
|
|
|
printf("%d\n", FP_MAX_BITS/2);
|
2020-01-06 15:23:45 +10:00
|
|
|
|
#else
|
|
|
|
|
|
printf("%d\n", SP_INT_MAX_BITS/2);
|
|
|
|
|
|
#endif
|
2018-08-08 15:16:32 -06:00
|
|
|
|
#else
|
|
|
|
|
|
/* normal math has unlimited max size */
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]);
|
2018-08-08 15:16:32 -06:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* ? */
|
|
|
|
|
|
printf("%s %s\n", msg[++msgid], wolfSSLIP); /* -h */
|
|
|
|
|
|
printf("%s %d\n", msg[++msgid], wolfSSLPort); /* -p */
|
2017-07-03 18:29:15 +10:00
|
|
|
|
#ifndef WOLFSSL_TLS13
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s %d\n", msg[++msgid], CLIENT_DEFAULT_VERSION); /* -v */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -V */
|
2017-07-03 18:29:15 +10:00
|
|
|
|
#else
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s %d\n", msg[++msgid], CLIENT_DEFAULT_VERSION); /* -v */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -V */
|
|
|
|
|
|
#endif
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -l */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#ifndef NO_CERTS
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s %s\n", msg[++msgid], cliCertFile); /* -c */
|
|
|
|
|
|
printf("%s %s\n", msg[++msgid], cliKeyFile); /* -k */
|
|
|
|
|
|
printf("%s %s\n", msg[++msgid], caCertFile); /* -A */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#endif
|
2015-05-21 10:11:21 -07:00
|
|
|
|
#ifndef NO_DH
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s %d\n", msg[++msgid], DEFAULT_MIN_DHKEY_BITS);
|
2015-05-21 10:11:21 -07:00
|
|
|
|
#endif
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -b */
|
2015-10-13 15:00:53 -07:00
|
|
|
|
#ifdef HAVE_ALPN
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -L <str> */
|
|
|
|
|
|
#endif
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -B <num> */
|
2020-09-16 13:37:01 -07:00
|
|
|
|
#ifndef NO_PSK
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -s */
|
2020-09-16 13:37:01 -07:00
|
|
|
|
#endif
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -d */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -D */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -e */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -g */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -u */
|
2016-08-25 22:20:35 -07:00
|
|
|
|
#ifdef WOLFSSL_SCTP
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -G */
|
2016-08-25 22:20:35 -07:00
|
|
|
|
#endif
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#ifndef NO_CERTS
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -m */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#endif
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -N */
|
2017-11-09 11:05:28 -08:00
|
|
|
|
#ifndef NO_SESSION_CACHE
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -r */
|
2017-11-09 11:05:28 -08:00
|
|
|
|
#endif
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -w */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -M */
|
2014-09-24 18:48:23 -07:00
|
|
|
|
#ifdef HAVE_SECURE_RENEGOTIATION
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -R */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -i */
|
2014-09-24 18:48:23 -07:00
|
|
|
|
#endif
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -f */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#ifndef NO_CERTS
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -x */
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#endif
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -X */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -j */
|
2013-04-08 16:01:52 -07:00
|
|
|
|
#ifdef SHOW_SIZES
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -z */
|
2013-04-08 16:01:52 -07:00
|
|
|
|
#endif
|
2013-07-23 15:42:43 -03:00
|
|
|
|
#ifdef HAVE_SNI
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -S */
|
2013-07-23 15:42:43 -03:00
|
|
|
|
#endif
|
2014-02-16 10:19:40 -03:00
|
|
|
|
#ifdef HAVE_MAX_FRAGMENT
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -F */
|
2013-07-23 15:42:43 -03:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_TRUNCATED_HMAC
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -T */
|
2013-07-23 15:42:43 -03:00
|
|
|
|
#endif
|
2016-09-01 15:17:46 -06:00
|
|
|
|
#ifdef HAVE_EXTENDED_MASTER
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -n */
|
2016-09-01 15:17:46 -06:00
|
|
|
|
#endif
|
2013-06-20 11:07:54 -07:00
|
|
|
|
#ifdef HAVE_OCSP
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -o */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -O */
|
2013-06-20 11:07:54 -07:00
|
|
|
|
#endif
|
2015-12-28 19:38:04 -03:00
|
|
|
|
#if defined(HAVE_CERTIFICATE_STATUS_REQUEST) \
|
|
|
|
|
|
|| defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2)
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -W */
|
2021-06-16 00:26:48 -05:00
|
|
|
|
printf("%s", msg[++msgid]); /* note for -W */
|
2015-11-02 15:51:01 -03:00
|
|
|
|
#endif
|
2019-08-22 09:33:38 +10:00
|
|
|
|
#if defined(ATOMIC_USER) && !defined(WOLFSSL_AEAD_ONLY)
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -U */
|
2013-08-09 17:27:15 -07:00
|
|
|
|
#endif
|
2015-10-14 19:13:45 -07:00
|
|
|
|
#ifdef HAVE_PK_CALLBACKS
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -P */
|
2013-08-22 18:19:39 -07:00
|
|
|
|
#endif
|
2014-12-01 11:44:32 -08:00
|
|
|
|
#ifdef HAVE_ANON
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -a */
|
2014-12-01 11:44:32 -08:00
|
|
|
|
#endif
|
2015-05-07 10:02:43 -07:00
|
|
|
|
#ifdef HAVE_CRL
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -C */
|
2015-05-07 10:02:43 -07:00
|
|
|
|
#endif
|
2016-03-01 16:35:32 -07:00
|
|
|
|
#ifdef WOLFSSL_TRUST_PEER_CERT
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -E */
|
2016-03-01 16:35:32 -07:00
|
|
|
|
#endif
|
2016-05-05 15:31:25 -06:00
|
|
|
|
#ifdef HAVE_WNR
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s %s\n", msg[++msgid], wnrConfig); /* -q */
|
2016-11-24 01:31:07 +10:00
|
|
|
|
#endif
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -H */
|
2019-08-22 09:33:38 +10:00
|
|
|
|
printf("%s", msg[++msgid]); /* more -H options */
|
2016-11-24 01:31:07 +10:00
|
|
|
|
#ifdef WOLFSSL_TLS13
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -J */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -K */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -I */
|
2016-11-24 01:31:07 +10:00
|
|
|
|
#ifndef NO_DH
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -y */
|
2016-11-24 01:31:07 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_ECC
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -Y */
|
2016-11-24 01:31:07 +10:00
|
|
|
|
#endif
|
2017-05-22 09:09:31 +10:00
|
|
|
|
#endif /* WOLFSSL_TLS13 */
|
2017-05-19 10:58:43 +10:00
|
|
|
|
#ifdef HAVE_CURVE25519
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -t */
|
2017-05-19 10:58:43 +10:00
|
|
|
|
#endif
|
2017-06-08 10:32:51 +10:00
|
|
|
|
#if defined(WOLFSSL_TLS13) && defined(WOLFSSL_POST_HANDSHAKE_AUTH)
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -Q */
|
2017-06-08 10:32:51 +10:00
|
|
|
|
#endif
|
2017-06-19 11:37:10 +10:00
|
|
|
|
#ifdef WOLFSSL_EARLY_DATA
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -0 */
|
2017-06-19 11:37:10 +10:00
|
|
|
|
#endif
|
2016-12-15 11:43:15 -08:00
|
|
|
|
#ifdef WOLFSSL_MULTICAST
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -3 */
|
2016-12-15 11:43:15 -08:00
|
|
|
|
#endif
|
2018-10-20 13:40:01 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -1 */
|
2019-02-20 11:23:00 -08:00
|
|
|
|
#if !defined(NO_DH) && !defined(HAVE_FIPS) && \
|
|
|
|
|
|
!defined(HAVE_SELFTEST) && !defined(WOLFSSL_OLD_PRIME_CHECK)
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -2 */
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_SECURE_RENEGOTIATION
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -4 */
|
|
|
|
|
|
#endif
|
2019-02-21 10:28:23 -08:00
|
|
|
|
#ifdef HAVE_TRUSTED_CA
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -5 */
|
|
|
|
|
|
#endif
|
2021-02-15 15:47:03 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -6 */
|
2020-02-19 18:07:45 +10:00
|
|
|
|
#ifdef HAVE_CURVE448
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -8 */
|
|
|
|
|
|
#endif
|
2021-02-15 15:47:03 +09:00
|
|
|
|
#if defined(OPENSSL_ALL) && defined(WOLFSSL_CERT_GEN) && \
|
2021-03-11 15:43:54 +09:00
|
|
|
|
(defined(WOLFSSL_CERT_REQ) || defined(WOLFSSL_CERT_EXT)) && \
|
2021-02-15 15:47:03 +09:00
|
|
|
|
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR)
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* -9 */
|
|
|
|
|
|
#endif
|
2021-06-21 15:09:39 -07:00
|
|
|
|
#if defined(WOLFSSL_WOLFSENTRY_HOOKS) && !defined(NO_FILESYSTEM) && \
|
|
|
|
|
|
!defined(WOLFSENTRY_NO_JSON)
|
2021-06-16 00:26:48 -05:00
|
|
|
|
printf("%s", msg[++msgid]); /* --wolfsentry-config */
|
|
|
|
|
|
#endif
|
2021-05-14 14:37:04 +09:00
|
|
|
|
printf("%s", msg[++msgid]); /* -7 */
|
2021-11-05 18:16:08 -05:00
|
|
|
|
printf("%s", msg[++msgid]); /* Examples repo link */
|
2021-12-20 11:26:25 -05:00
|
|
|
|
#ifdef HAVE_PQC
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* --pqc */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* --pqc options */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* more --pqc options */
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* more --pqc options */
|
2021-04-28 10:28:35 -07:00
|
|
|
|
#endif
|
2022-10-07 11:19:34 -07:00
|
|
|
|
#ifdef WOLFSSL_SYS_CA_CERTS
|
2022-09-30 10:02:56 -07:00
|
|
|
|
printf("%s", msg[++msgid]); /* --sys-ca-certs */
|
|
|
|
|
|
#endif
|
2023-01-24 12:00:37 +10:00
|
|
|
|
#ifdef HAVE_SUPPORTED_CURVES
|
|
|
|
|
|
printf("%s", msg[++msgid]); /* --onlyPskDheKe */
|
|
|
|
|
|
#endif
|
2022-01-14 13:43:29 -08:00
|
|
|
|
#ifdef WOLFSSL_SRTP
|
2022-01-13 16:09:11 -08:00
|
|
|
|
printf("%s", msg[++msgid]); /* dtls-srtp */
|
|
|
|
|
|
#endif
|
2012-08-01 12:55:13 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
2022-01-19 13:03:29 +01:00
|
|
|
|
#ifdef WOLFSSL_SRTP
|
|
|
|
|
|
/**
|
|
|
|
|
|
* client_srtp_test() - test that the computed ekm matches with the server one
|
|
|
|
|
|
* @ssl: ssl context
|
|
|
|
|
|
* @srtp_helper: srtp_test_helper struct shared with the server
|
|
|
|
|
|
*
|
|
|
|
|
|
* if @srtp_helper is NULL no check is made, but the ekm is printed.
|
|
|
|
|
|
*
|
|
|
|
|
|
* calls srtp_helper_get_ekm() to wait and then get the ekm computed by the
|
|
|
|
|
|
* server, then check if it matches the one computed by itself.
|
|
|
|
|
|
*/
|
2022-01-20 16:07:16 +01:00
|
|
|
|
static int client_srtp_test(WOLFSSL *ssl, func_args *args)
|
2022-01-19 13:03:29 +01:00
|
|
|
|
{
|
2022-01-20 16:07:16 +01:00
|
|
|
|
size_t srtp_secret_length;
|
|
|
|
|
|
byte *srtp_secret, *p;
|
2022-01-19 13:03:29 +01:00
|
|
|
|
int ret;
|
2022-01-20 16:07:16 +01:00
|
|
|
|
#if !defined(SINGLE_THREADED) && defined(_POSIX_THREADS)
|
|
|
|
|
|
srtp_test_helper *srtp_helper = args->srtp_helper;
|
|
|
|
|
|
byte *other_secret = NULL;
|
|
|
|
|
|
size_t other_size = 0;
|
|
|
|
|
|
#else
|
|
|
|
|
|
(void)args;
|
|
|
|
|
|
#endif
|
2022-01-19 13:03:29 +01:00
|
|
|
|
|
|
|
|
|
|
ret = wolfSSL_export_dtls_srtp_keying_material(ssl, NULL,
|
|
|
|
|
|
&srtp_secret_length);
|
|
|
|
|
|
if (ret != LENGTH_ONLY_E) {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "DTLS SRTP: Error getting keying material length\n");
|
2022-01-19 13:03:29 +01:00
|
|
|
|
return ret;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2022-01-19 09:20:45 -08:00
|
|
|
|
srtp_secret = (byte*)XMALLOC(srtp_secret_length,
|
2022-01-19 13:03:29 +01:00
|
|
|
|
NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
2022-01-19 09:20:45 -08:00
|
|
|
|
if (srtp_secret == NULL) {
|
|
|
|
|
|
err_sys("DTLS SRTP: Low memory");
|
|
|
|
|
|
}
|
2022-01-19 13:03:29 +01:00
|
|
|
|
|
|
|
|
|
|
ret = wolfSSL_export_dtls_srtp_keying_material(ssl, srtp_secret,
|
|
|
|
|
|
&srtp_secret_length);
|
|
|
|
|
|
if (ret != WOLFSSL_SUCCESS) {
|
2022-01-19 09:20:45 -08:00
|
|
|
|
XFREE(srtp_secret, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "DTLS SRTP: Error getting keying material\n");
|
2022-01-19 13:03:29 +01:00
|
|
|
|
return ret;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2022-01-20 16:07:16 +01:00
|
|
|
|
printf("DTLS SRTP: Exported key material: ");
|
2022-01-19 13:03:29 +01:00
|
|
|
|
for (p = srtp_secret; p < srtp_secret + srtp_secret_length; p++)
|
|
|
|
|
|
printf("%02X", *p);
|
|
|
|
|
|
printf("\n");
|
|
|
|
|
|
|
2022-01-20 16:07:16 +01:00
|
|
|
|
#if !defined(SINGLE_THREADED) && defined(_POSIX_THREADS)
|
2022-01-19 13:03:29 +01:00
|
|
|
|
if (srtp_helper != NULL) {
|
|
|
|
|
|
srtp_helper_get_ekm(srtp_helper, &other_secret, &other_size);
|
|
|
|
|
|
|
|
|
|
|
|
if (other_size != srtp_secret_length ||
|
|
|
|
|
|
(XMEMCMP(other_secret, srtp_secret, srtp_secret_length) != 0)) {
|
|
|
|
|
|
|
|
|
|
|
|
/* we are delegated from server to free this buffer */
|
|
|
|
|
|
XFREE(other_secret, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
2022-01-19 09:20:45 -08:00
|
|
|
|
printf("DTLS SRTP: Exported Keying Material mismatch\n");
|
2022-01-19 13:03:29 +01:00
|
|
|
|
return WOLFSSL_UNKNOWN;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* we are delegated from server to free this buffer */
|
|
|
|
|
|
XFREE(other_secret, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
|
|
|
}
|
2022-01-20 16:07:16 +01:00
|
|
|
|
#endif
|
2022-01-19 13:03:29 +01:00
|
|
|
|
|
|
|
|
|
|
XFREE(srtp_secret, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
2022-01-19 09:20:45 -08:00
|
|
|
|
#endif /* WOLFSSL_SRTP */
|
2022-01-19 13:03:29 +01:00
|
|
|
|
|
2022-10-11 13:14:59 -07:00
|
|
|
|
|
2015-01-05 14:48:43 -07:00
|
|
|
|
THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
|
2011-02-05 11:14:47 -08:00
|
|
|
|
{
|
2015-10-14 19:13:45 -07:00
|
|
|
|
SOCKET_T sockfd = WOLFSSL_SOCKET_INVALID;
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2017-10-20 14:56:29 -07:00
|
|
|
|
wolfSSL_method_func method = NULL;
|
2021-12-22 12:51:01 -08:00
|
|
|
|
WOLFSSL_CTX* ctx = NULL;
|
|
|
|
|
|
WOLFSSL* ssl = NULL;
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
2021-06-16 00:26:48 -05:00
|
|
|
|
#ifdef WOLFSSL_WOLFSENTRY_HOOKS
|
|
|
|
|
|
wolfsentry_errcode_t wolfsentry_ret;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2021-12-22 12:51:01 -08:00
|
|
|
|
WOLFSSL* sslResume = NULL;
|
|
|
|
|
|
WOLFSSL_SESSION* session = NULL;
|
|
|
|
|
|
#if !defined(NO_SESSION_CACHE) && (defined(OPENSSL_EXTRA) || \
|
|
|
|
|
|
defined(HAVE_EXT_CACHE))
|
2019-09-11 15:28:30 -07:00
|
|
|
|
byte* flatSession = NULL;
|
|
|
|
|
|
int flatSessionSz = 0;
|
2021-12-22 12:51:01 -08:00
|
|
|
|
#endif
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2020-07-21 13:34:25 -07:00
|
|
|
|
char msg[CLI_MSG_SZ];
|
|
|
|
|
|
int msgSz = 0;
|
|
|
|
|
|
char reply[CLI_REPLY_SZ];
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2015-02-25 13:34:29 -08:00
|
|
|
|
word16 port = wolfSSLPort;
|
|
|
|
|
|
char* host = (char*)wolfSSLIP;
|
2015-09-24 12:13:01 -07:00
|
|
|
|
const char* domain = "localhost"; /* can't default to www.wolfssl.com
|
|
|
|
|
|
because can't tell if we're really
|
|
|
|
|
|
going there to detect old chacha-poly
|
|
|
|
|
|
*/
|
2020-04-08 09:46:22 +10:00
|
|
|
|
#ifndef WOLFSSL_VXWORKS
|
2012-08-01 12:55:13 -07:00
|
|
|
|
int ch;
|
2021-06-16 00:26:48 -05:00
|
|
|
|
static const struct mygetopt_long_config long_options[] = {
|
2021-06-21 15:09:39 -07:00
|
|
|
|
#if defined(WOLFSSL_WOLFSENTRY_HOOKS) && !defined(NO_FILESYSTEM) && \
|
|
|
|
|
|
!defined(WOLFSENTRY_NO_JSON)
|
2021-06-16 00:26:48 -05:00
|
|
|
|
{ "wolfsentry-config", 1, 256 },
|
|
|
|
|
|
#endif
|
|
|
|
|
|
{ "help", 0, 257 },
|
|
|
|
|
|
{ "ヘルプ", 0, 258 },
|
2021-12-20 11:26:25 -05:00
|
|
|
|
#if defined(HAVE_PQC)
|
|
|
|
|
|
{ "pqc", 1, 259 },
|
2022-01-13 16:09:11 -08:00
|
|
|
|
#endif
|
2022-01-14 13:43:29 -08:00
|
|
|
|
#ifdef WOLFSSL_SRTP
|
2022-01-13 16:09:11 -08:00
|
|
|
|
{ "srtp", 2, 260 }, /* optional argument */
|
2021-04-28 10:28:35 -07:00
|
|
|
|
#endif
|
2022-05-20 10:00:24 +02:00
|
|
|
|
#ifdef WOLFSSL_DTLS13
|
|
|
|
|
|
/* allow waitTicket option even when HAVE_SESSION_TICKET is 0. Otherwise
|
|
|
|
|
|
* tests that use this option will ignore the options following
|
|
|
|
|
|
* --waitTicket in the command line and fail */
|
|
|
|
|
|
{"waitTicket", 0, 261},
|
|
|
|
|
|
#endif /* WOLFSSL_DTLS13 */
|
2022-08-10 16:41:42 +02:00
|
|
|
|
#ifdef WOLFSSL_DTLS_CID
|
|
|
|
|
|
{"cid", 2, 262},
|
|
|
|
|
|
#endif /* WOLFSSL_DTLS_CID */
|
2022-10-07 11:19:34 -07:00
|
|
|
|
#ifdef WOLFSSL_SYS_CA_CERTS
|
2022-09-30 10:02:56 -07:00
|
|
|
|
{ "sys-ca-certs", 0, 263 },
|
2023-01-24 12:00:37 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_SUPPORTED_CURVES
|
|
|
|
|
|
{ "onlyPskDheKe", 0, 264 },
|
2023-04-24 17:03:34 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifndef NO_PSK
|
|
|
|
|
|
{ "openssl-psk", 0, 265 },
|
2022-10-07 11:19:34 -07:00
|
|
|
|
#endif
|
2021-06-16 00:26:48 -05:00
|
|
|
|
{ 0, 0, 0 }
|
|
|
|
|
|
};
|
2020-04-08 09:46:22 +10:00
|
|
|
|
#endif
|
2013-03-07 22:52:51 -08:00
|
|
|
|
int version = CLIENT_INVALID_VERSION;
|
2021-04-22 14:52:57 -07:00
|
|
|
|
int minVersion = CLIENT_INVALID_VERSION;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
int usePsk = 0;
|
2023-04-24 17:03:34 +10:00
|
|
|
|
int opensslPsk = 0;
|
2014-12-01 11:44:32 -08:00
|
|
|
|
int useAnon = 0;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
int sendGET = 0;
|
|
|
|
|
|
int benchmark = 0;
|
2018-04-09 13:53:05 +10:00
|
|
|
|
int block = TEST_BUFFER_SIZE;
|
2019-12-18 07:09:26 -08:00
|
|
|
|
size_t throughput = 0;
|
2012-08-02 11:54:49 -07:00
|
|
|
|
int doDTLS = 0;
|
2016-08-25 22:20:35 -07:00
|
|
|
|
int dtlsUDP = 0;
|
2021-04-12 20:02:18 +02:00
|
|
|
|
#if (defined(WOLFSSL_SCTP) || defined(WOLFSSL_DTLS_MTU)) && \
|
|
|
|
|
|
defined(WOLFSSL_DTLS)
|
|
|
|
|
|
int dtlsMTU = 0;
|
|
|
|
|
|
#endif
|
2016-08-25 22:20:35 -07:00
|
|
|
|
int dtlsSCTP = 0;
|
2016-12-15 11:43:15 -08:00
|
|
|
|
int doMcast = 0;
|
2012-08-10 10:15:37 -07:00
|
|
|
|
int matchName = 0;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
int doPeerCheck = 1;
|
2012-10-17 13:13:58 -07:00
|
|
|
|
int nonBlocking = 0;
|
2020-11-02 08:23:36 -06:00
|
|
|
|
int simulateWantWrite = 0;
|
2012-10-17 13:13:58 -07:00
|
|
|
|
int resumeSession = 0;
|
2015-05-07 10:02:43 -07:00
|
|
|
|
int wc_shutdown = 0;
|
|
|
|
|
|
int disableCRL = 0;
|
2015-05-07 12:50:27 -07:00
|
|
|
|
int externalTest = 0;
|
2015-02-16 14:23:33 -08:00
|
|
|
|
int ret;
|
2016-03-04 10:05:22 -08:00
|
|
|
|
int err = 0;
|
2014-09-29 15:32:41 -07:00
|
|
|
|
int scr = 0; /* allow secure renegotiation */
|
2020-07-21 13:34:25 -07:00
|
|
|
|
int forceScr = 0; /* force client initiated scr */
|
2020-09-30 13:46:23 +02:00
|
|
|
|
int scrAppData = 0;
|
2019-02-19 15:04:22 -08:00
|
|
|
|
int resumeScr = 0; /* use resumption for renegotiation */
|
2018-04-27 14:43:04 +10:00
|
|
|
|
#ifndef WOLFSSL_NO_CLIENT_AUTH
|
2013-04-19 13:10:19 -07:00
|
|
|
|
int useClientCert = 1;
|
2018-04-27 14:43:04 +10:00
|
|
|
|
#else
|
|
|
|
|
|
int useClientCert = 0;
|
|
|
|
|
|
#endif
|
2013-04-19 13:10:19 -07:00
|
|
|
|
int fewerPackets = 0;
|
2013-08-09 17:27:15 -07:00
|
|
|
|
int atomicUser = 0;
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#ifdef HAVE_PK_CALLBACKS
|
2013-08-22 18:19:39 -07:00
|
|
|
|
int pkCallbacks = 0;
|
2018-03-21 11:27:08 -07:00
|
|
|
|
PkCbInfo pkCbInfo;
|
|
|
|
|
|
#endif
|
2015-05-21 10:11:21 -07:00
|
|
|
|
int minDhKeyBits = DEFAULT_MIN_DHKEY_BITS;
|
2015-10-13 15:00:53 -07:00
|
|
|
|
char* alpnList = NULL;
|
|
|
|
|
|
unsigned char alpn_opt = 0;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
char* cipherList = NULL;
|
2017-04-05 11:21:11 -07:00
|
|
|
|
int useDefCipherList = 0;
|
2022-03-08 14:52:40 +01:00
|
|
|
|
int customVerifyCert = 0;
|
2020-01-15 22:15:38 +10:00
|
|
|
|
const char* verifyCert;
|
|
|
|
|
|
const char* ourCert;
|
|
|
|
|
|
const char* ourKey;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
|
2016-04-22 13:46:54 -06:00
|
|
|
|
int doSTARTTLS = 0;
|
|
|
|
|
|
char* starttlsProt = NULL;
|
2017-05-11 12:23:17 -07:00
|
|
|
|
int useVerifyCb = 0;
|
2018-09-21 09:27:48 -07:00
|
|
|
|
int useSupCurve = 0;
|
2016-04-22 13:46:54 -06:00
|
|
|
|
|
2016-03-01 16:35:32 -07:00
|
|
|
|
#ifdef WOLFSSL_TRUST_PEER_CERT
|
|
|
|
|
|
const char* trustCert = NULL;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2013-05-21 14:37:50 -07:00
|
|
|
|
#ifdef HAVE_SNI
|
|
|
|
|
|
char* sniHostName = NULL;
|
|
|
|
|
|
#endif
|
2018-09-28 09:05:59 -07:00
|
|
|
|
#ifdef HAVE_TRUSTED_CA
|
|
|
|
|
|
int trustedCaKeyId = 0;
|
|
|
|
|
|
#endif
|
2013-07-23 15:42:43 -03:00
|
|
|
|
#ifdef HAVE_MAX_FRAGMENT
|
|
|
|
|
|
byte maxFragment = 0;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_TRUNCATED_HMAC
|
2015-11-02 15:51:01 -03:00
|
|
|
|
byte truncatedHMAC = 0;
|
|
|
|
|
|
#endif
|
2015-12-28 19:38:04 -03:00
|
|
|
|
#if defined(HAVE_CERTIFICATE_STATUS_REQUEST) \
|
|
|
|
|
|
|| defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2)
|
2015-11-02 15:51:01 -03:00
|
|
|
|
byte statusRequest = 0;
|
2020-10-15 17:27:58 +10:00
|
|
|
|
byte mustStaple = 0;
|
2013-07-23 15:42:43 -03:00
|
|
|
|
#endif
|
2016-09-01 15:17:46 -06:00
|
|
|
|
#ifdef HAVE_EXTENDED_MASTER
|
2016-09-09 23:16:52 -07:00
|
|
|
|
byte disableExtMasterSecret = 0;
|
2016-09-01 15:17:46 -06:00
|
|
|
|
#endif
|
2016-11-24 01:31:07 +10:00
|
|
|
|
int helloRetry = 0;
|
|
|
|
|
|
int onlyKeyShare = 0;
|
2018-04-09 13:53:05 +10:00
|
|
|
|
#ifdef WOLFSSL_TLS13
|
2016-11-24 01:31:07 +10:00
|
|
|
|
int noPskDheKe = 0;
|
2023-01-24 12:00:37 +10:00
|
|
|
|
#ifdef HAVE_SUPPORTED_CURVES
|
|
|
|
|
|
int onlyPskDheKe = 0;
|
|
|
|
|
|
#endif
|
2017-06-08 10:32:51 +10:00
|
|
|
|
int postHandAuth = 0;
|
2016-11-24 01:31:07 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
int updateKeysIVs = 0;
|
2017-06-19 11:37:10 +10:00
|
|
|
|
int earlyData = 0;
|
2017-01-25 14:05:22 -08:00
|
|
|
|
#ifdef WOLFSSL_MULTICAST
|
2016-12-15 11:43:15 -08:00
|
|
|
|
byte mcastID = 0;
|
2017-01-25 14:05:22 -08:00
|
|
|
|
#endif
|
2018-12-03 13:53:44 -08:00
|
|
|
|
#if !defined(NO_DH) && !defined(HAVE_FIPS) && \
|
|
|
|
|
|
!defined(HAVE_SELFTEST) && !defined(WOLFSSL_OLD_PRIME_CHECK)
|
|
|
|
|
|
int doDhKeyCheck = 1;
|
|
|
|
|
|
#endif
|
2013-07-23 15:42:43 -03:00
|
|
|
|
|
2013-06-20 11:07:54 -07:00
|
|
|
|
#ifdef HAVE_OCSP
|
|
|
|
|
|
int useOcsp = 0;
|
|
|
|
|
|
char* ocspUrl = NULL;
|
|
|
|
|
|
#endif
|
2017-05-19 10:58:43 +10:00
|
|
|
|
int useX25519 = 0;
|
2020-02-19 18:07:45 +10:00
|
|
|
|
int useX448 = 0;
|
2021-12-20 11:26:25 -05:00
|
|
|
|
int usePqc = 0;
|
|
|
|
|
|
char* pqcAlg = NULL;
|
2018-05-03 10:02:59 -07:00
|
|
|
|
int exitWithRet = 0;
|
2018-10-09 12:54:41 -07:00
|
|
|
|
int loadCertKeyIntoSSLObj = 0;
|
2022-10-07 11:19:34 -07:00
|
|
|
|
#ifdef WOLFSSL_SYS_CA_CERTS
|
2022-09-30 10:02:56 -07:00
|
|
|
|
byte loadSysCaCerts = 0;
|
|
|
|
|
|
#endif
|
2013-06-20 11:07:54 -07:00
|
|
|
|
|
2019-08-22 09:33:38 +10:00
|
|
|
|
#ifdef HAVE_ENCRYPT_THEN_MAC
|
|
|
|
|
|
int disallowETM = 0;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2016-05-05 15:31:25 -06:00
|
|
|
|
#ifdef HAVE_WNR
|
|
|
|
|
|
const char* wnrConfigFile = wnrConfig;
|
2021-02-15 15:47:03 +09:00
|
|
|
|
#endif
|
|
|
|
|
|
#if defined(OPENSSL_ALL) && defined(WOLFSSL_CERT_GEN) && \
|
2021-03-11 15:43:54 +09:00
|
|
|
|
(defined(WOLFSSL_CERT_REQ) || defined(WOLFSSL_CERT_EXT)) && \
|
2021-02-15 15:47:03 +09:00
|
|
|
|
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR)
|
|
|
|
|
|
int useCertFolder = 0;
|
2016-05-05 15:31:25 -06:00
|
|
|
|
#endif
|
2022-01-14 13:43:29 -08:00
|
|
|
|
#ifdef WOLFSSL_SRTP
|
|
|
|
|
|
const char* dtlsSrtpProfiles = NULL;
|
2022-01-13 16:09:11 -08:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2022-05-20 10:00:24 +02:00
|
|
|
|
#ifdef HAVE_SESSION_TICKET
|
|
|
|
|
|
int waitTicket = 0;
|
|
|
|
|
|
#endif /* HAVE_SESSION_TICKET */
|
2022-08-10 16:41:42 +02:00
|
|
|
|
#ifdef WOLFSSL_DTLS_CID
|
|
|
|
|
|
int useDtlsCID = 0;
|
|
|
|
|
|
char dtlsCID[DTLS_CID_BUFFER_SIZE] = { 0 };
|
|
|
|
|
|
#endif /* WOLFSSL_DTLS_CID */
|
2022-05-20 10:00:24 +02:00
|
|
|
|
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
char buffer[WOLFSSL_MAX_ERROR_SZ];
|
2016-05-05 15:31:25 -06:00
|
|
|
|
|
2011-02-05 11:14:47 -08:00
|
|
|
|
int argc = ((func_args*)args)->argc;
|
|
|
|
|
|
char** argv = ((func_args*)args)->argv;
|
|
|
|
|
|
|
2017-10-23 10:50:19 -07:00
|
|
|
|
|
|
|
|
|
|
#ifdef WOLFSSL_STATIC_MEMORY
|
|
|
|
|
|
#if (defined(HAVE_ECC) && !defined(ALT_ECC_SIZE)) \
|
|
|
|
|
|
|| defined(SESSION_CERTS)
|
|
|
|
|
|
/* big enough to handle most cases including session certs */
|
2017-10-26 08:06:08 -07:00
|
|
|
|
byte memory[320000];
|
2017-10-23 10:50:19 -07:00
|
|
|
|
#else
|
|
|
|
|
|
byte memory[80000];
|
|
|
|
|
|
#endif
|
|
|
|
|
|
byte memoryIO[34500]; /* max for IO buffer (TLS packet can be 16k) */
|
|
|
|
|
|
WOLFSSL_MEM_CONN_STATS ssl_stats;
|
|
|
|
|
|
#ifdef DEBUG_WOLFSSL
|
|
|
|
|
|
WOLFSSL_MEM_STATS mem_stats;
|
|
|
|
|
|
#endif
|
2019-11-05 15:13:26 -07:00
|
|
|
|
WOLFSSL_HEAP_HINT *heap = NULL;
|
2017-10-23 10:50:19 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2011-02-05 11:14:47 -08:00
|
|
|
|
((func_args*)args)->return_code = -1; /* error state */
|
|
|
|
|
|
|
2020-01-15 22:15:38 +10:00
|
|
|
|
#ifndef NO_RSA
|
|
|
|
|
|
verifyCert = caCertFile;
|
|
|
|
|
|
ourCert = cliCertFile;
|
|
|
|
|
|
ourKey = cliKeyFile;
|
|
|
|
|
|
#else
|
2018-07-23 10:20:18 +10:00
|
|
|
|
#ifdef HAVE_ECC
|
2020-01-15 22:15:38 +10:00
|
|
|
|
verifyCert = caEccCertFile;
|
|
|
|
|
|
ourCert = cliEccCertFile;
|
|
|
|
|
|
ourKey = cliEccKeyFile;
|
2018-07-23 10:20:18 +10:00
|
|
|
|
#elif defined(HAVE_ED25519)
|
2020-01-15 22:15:38 +10:00
|
|
|
|
verifyCert = caEdCertFile;
|
|
|
|
|
|
ourCert = cliEdCertFile;
|
|
|
|
|
|
ourKey = cliEdKeyFile;
|
2020-02-19 18:07:45 +10:00
|
|
|
|
#elif defined(HAVE_ED448)
|
|
|
|
|
|
verifyCert = caEd448CertFile;
|
|
|
|
|
|
ourCert = cliEd448CertFile;
|
|
|
|
|
|
ourKey = cliEd448KeyFile;
|
2020-01-15 22:15:38 +10:00
|
|
|
|
#else
|
|
|
|
|
|
verifyCert = NULL;
|
|
|
|
|
|
ourCert = NULL;
|
|
|
|
|
|
ourKey = NULL;
|
2018-07-23 10:20:18 +10:00
|
|
|
|
#endif
|
2013-03-07 18:20:29 -08:00
|
|
|
|
#endif
|
2020-01-15 22:15:38 +10:00
|
|
|
|
|
2013-03-11 16:07:46 -07:00
|
|
|
|
(void)session;
|
|
|
|
|
|
(void)sslResume;
|
2013-08-09 17:27:15 -07:00
|
|
|
|
(void)atomicUser;
|
2014-09-24 18:48:23 -07:00
|
|
|
|
(void)scr;
|
2014-09-29 15:32:41 -07:00
|
|
|
|
(void)forceScr;
|
2020-09-30 13:46:23 +02:00
|
|
|
|
(void)scrAppData;
|
2019-02-19 15:04:22 -08:00
|
|
|
|
(void)resumeScr;
|
2015-03-27 19:20:31 -07:00
|
|
|
|
(void)ourKey;
|
|
|
|
|
|
(void)ourCert;
|
|
|
|
|
|
(void)verifyCert;
|
|
|
|
|
|
(void)useClientCert;
|
2015-05-07 10:02:43 -07:00
|
|
|
|
(void)disableCRL;
|
2015-05-21 10:11:21 -07:00
|
|
|
|
(void)minDhKeyBits;
|
2015-10-13 15:00:53 -07:00
|
|
|
|
(void)alpnList;
|
|
|
|
|
|
(void)alpn_opt;
|
2016-11-24 01:31:07 +10:00
|
|
|
|
(void)updateKeysIVs;
|
2019-01-24 14:30:06 +10:00
|
|
|
|
(void)earlyData;
|
2017-05-31 11:44:43 +10:00
|
|
|
|
(void)useX25519;
|
2020-02-19 18:07:45 +10:00
|
|
|
|
(void)useX448;
|
2017-06-29 09:00:44 +10:00
|
|
|
|
(void)helloRetry;
|
2018-04-09 13:53:05 +10:00
|
|
|
|
(void)onlyKeyShare;
|
2018-09-21 09:27:48 -07:00
|
|
|
|
(void)useSupCurve;
|
2018-10-09 12:54:41 -07:00
|
|
|
|
(void)loadCertKeyIntoSSLObj;
|
2021-12-20 11:26:25 -05:00
|
|
|
|
(void)usePqc;
|
|
|
|
|
|
(void)pqcAlg;
|
2023-04-24 17:03:34 +10:00
|
|
|
|
(void)opensslPsk;
|
2013-06-03 14:56:37 -07:00
|
|
|
|
StackTrap();
|
|
|
|
|
|
|
2020-07-22 13:20:23 -07:00
|
|
|
|
/* Reinitialize the global myVerifyAction. */
|
|
|
|
|
|
myVerifyAction = VERIFY_OVERRIDE_ERROR;
|
|
|
|
|
|
|
2015-10-29 13:39:02 -06:00
|
|
|
|
#ifndef WOLFSSL_VXWORKS
|
2017-06-08 10:32:51 +10:00
|
|
|
|
/* Not used: All used */
|
2021-06-16 00:26:48 -05:00
|
|
|
|
while ((ch = mygetopt_long(argc, argv, "?:"
|
2021-04-12 20:02:18 +02:00
|
|
|
|
"ab:c:defgh:i;jk:l:mnop:q:rstu;v:wxyz"
|
2017-10-19 16:17:51 -07:00
|
|
|
|
"A:B:CDE:F:GH:IJKL:M:NO:PQRS:TUVW:XYZ:"
|
2021-04-22 14:52:57 -07:00
|
|
|
|
"01:23:4567:89"
|
2021-06-16 00:26:48 -05:00
|
|
|
|
"@#", long_options, 0)) != -1) {
|
2012-08-01 12:55:13 -07:00
|
|
|
|
switch (ch) {
|
|
|
|
|
|
case '?' :
|
2018-10-20 13:40:01 +09:00
|
|
|
|
if(myoptarg!=NULL) {
|
|
|
|
|
|
lng_index = atoi(myoptarg);
|
|
|
|
|
|
if(lng_index<0||lng_index>1){
|
|
|
|
|
|
lng_index = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2012-08-01 12:55:13 -07:00
|
|
|
|
Usage();
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(EXIT_SUCCESS);
|
2012-08-01 12:55:13 -07:00
|
|
|
|
|
2021-06-16 00:26:48 -05:00
|
|
|
|
case 257 :
|
|
|
|
|
|
lng_index = 0;
|
|
|
|
|
|
Usage();
|
|
|
|
|
|
XEXIT_T(EXIT_SUCCESS);
|
|
|
|
|
|
|
|
|
|
|
|
case 258 :
|
|
|
|
|
|
lng_index = 1;
|
|
|
|
|
|
Usage();
|
|
|
|
|
|
XEXIT_T(EXIT_SUCCESS);
|
|
|
|
|
|
|
2012-08-01 12:55:13 -07:00
|
|
|
|
case 'g' :
|
|
|
|
|
|
sendGET = 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'd' :
|
|
|
|
|
|
doPeerCheck = 0;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2015-10-02 16:25:17 -07:00
|
|
|
|
case 'e' :
|
|
|
|
|
|
ShowCiphers();
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(EXIT_SUCCESS);
|
2015-10-02 16:25:17 -07:00
|
|
|
|
|
2014-07-02 12:07:25 -07:00
|
|
|
|
case 'D' :
|
2020-06-18 09:26:50 -07:00
|
|
|
|
myVerifyAction = VERIFY_OVERRIDE_DATE_ERR;
|
2014-07-02 12:07:25 -07:00
|
|
|
|
break;
|
|
|
|
|
|
|
2015-05-07 10:02:43 -07:00
|
|
|
|
case 'C' :
|
2015-06-10 15:24:24 -07:00
|
|
|
|
#ifdef HAVE_CRL
|
|
|
|
|
|
disableCRL = 1;
|
|
|
|
|
|
#endif
|
2015-05-07 10:02:43 -07:00
|
|
|
|
break;
|
|
|
|
|
|
|
2012-08-02 11:54:49 -07:00
|
|
|
|
case 'u' :
|
2016-08-25 22:20:35 -07:00
|
|
|
|
doDTLS = 1;
|
|
|
|
|
|
dtlsUDP = 1;
|
2021-04-12 20:02:18 +02:00
|
|
|
|
#if (defined(WOLFSSL_SCTP) || defined(WOLFSSL_DTLS_MTU)) && \
|
|
|
|
|
|
defined(WOLFSSL_DTLS)
|
|
|
|
|
|
dtlsMTU = atoi(myoptarg);
|
|
|
|
|
|
#endif
|
2016-08-25 22:20:35 -07:00
|
|
|
|
break;
|
|
|
|
|
|
|
2022-01-14 13:43:29 -08:00
|
|
|
|
#ifdef WOLFSSL_SRTP
|
2022-01-13 16:09:11 -08:00
|
|
|
|
case 260:
|
|
|
|
|
|
doDTLS = 1;
|
|
|
|
|
|
dtlsUDP = 1;
|
2022-01-14 13:43:29 -08:00
|
|
|
|
dtlsSrtpProfiles = myoptarg != NULL ? myoptarg :
|
2022-01-13 16:09:11 -08:00
|
|
|
|
"SRTP_AES128_CM_SHA1_80";
|
2022-01-14 13:43:29 -08:00
|
|
|
|
printf("Using SRTP Profile(s): %s\n", dtlsSrtpProfiles);
|
2022-01-13 16:09:11 -08:00
|
|
|
|
break;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2022-05-20 10:00:24 +02:00
|
|
|
|
#ifdef WOLFSSL_DTLS13
|
|
|
|
|
|
case 261:
|
|
|
|
|
|
#ifdef HAVE_SESSION_TICKET
|
|
|
|
|
|
waitTicket = 1;
|
|
|
|
|
|
#endif /* HAVE_SESSION_TICKET */
|
|
|
|
|
|
break;
|
|
|
|
|
|
#endif /* WOLFSSL_DTLS13 */
|
2022-08-10 16:41:42 +02:00
|
|
|
|
#ifdef WOLFSSL_DTLS_CID
|
|
|
|
|
|
case 262:
|
|
|
|
|
|
useDtlsCID = 1;
|
|
|
|
|
|
if (myoptarg != NULL) {
|
2022-08-24 16:02:05 -07:00
|
|
|
|
if (XSTRLEN(myoptarg) >= DTLS_CID_BUFFER_SIZE) {
|
2022-08-10 16:41:42 +02:00
|
|
|
|
err_sys("provided connection ID is too big");
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
strcpy(dtlsCID, myoptarg);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
#endif /* WOLFSSL_CID */
|
2016-08-25 22:20:35 -07:00
|
|
|
|
case 'G' :
|
|
|
|
|
|
#ifdef WOLFSSL_SCTP
|
|
|
|
|
|
doDTLS = 1;
|
2022-01-13 16:09:11 -08:00
|
|
|
|
dtlsUDP = 1;
|
2016-08-25 22:20:35 -07:00
|
|
|
|
dtlsSCTP = 1;
|
|
|
|
|
|
#endif
|
2012-08-02 11:54:49 -07:00
|
|
|
|
break;
|
|
|
|
|
|
|
2012-08-01 12:55:13 -07:00
|
|
|
|
case 's' :
|
|
|
|
|
|
usePsk = 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2016-03-01 16:35:32 -07:00
|
|
|
|
#ifdef WOLFSSL_TRUST_PEER_CERT
|
|
|
|
|
|
case 'E' :
|
|
|
|
|
|
trustCert = myoptarg;
|
|
|
|
|
|
break;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2012-08-10 10:15:37 -07:00
|
|
|
|
case 'm' :
|
|
|
|
|
|
matchName = 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2013-04-19 13:10:19 -07:00
|
|
|
|
case 'x' :
|
|
|
|
|
|
useClientCert = 0;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2015-05-07 12:50:27 -07:00
|
|
|
|
case 'X' :
|
|
|
|
|
|
externalTest = 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2013-04-19 13:10:19 -07:00
|
|
|
|
case 'f' :
|
|
|
|
|
|
fewerPackets = 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2013-08-09 17:27:15 -07:00
|
|
|
|
case 'U' :
|
2019-08-22 09:33:38 +10:00
|
|
|
|
#if defined(ATOMIC_USER) && !defined(WOLFSSL_AEAD_ONLY)
|
2013-08-09 17:27:15 -07:00
|
|
|
|
atomicUser = 1;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2013-08-22 18:19:39 -07:00
|
|
|
|
case 'P' :
|
2015-10-14 19:13:45 -07:00
|
|
|
|
#ifdef HAVE_PK_CALLBACKS
|
2013-08-22 18:19:39 -07:00
|
|
|
|
pkCallbacks = 1;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2012-08-01 12:55:13 -07:00
|
|
|
|
case 'h' :
|
2012-08-01 17:33:49 -07:00
|
|
|
|
host = myoptarg;
|
|
|
|
|
|
domain = myoptarg;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'p' :
|
2014-03-03 16:46:48 -08:00
|
|
|
|
port = (word16)atoi(myoptarg);
|
2013-03-26 22:00:39 -07:00
|
|
|
|
#if !defined(NO_MAIN_DRIVER) || defined(USE_WINDOWS_API)
|
|
|
|
|
|
if (port == 0)
|
|
|
|
|
|
err_sys("port number cannot be 0");
|
|
|
|
|
|
#endif
|
2012-08-01 12:55:13 -07:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'v' :
|
2018-02-22 11:05:58 +10:00
|
|
|
|
if (myoptarg[0] == 'd') {
|
|
|
|
|
|
version = CLIENT_DOWNGRADE_VERSION;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
2018-10-04 14:48:53 -07:00
|
|
|
|
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_EITHER_SIDE)
|
|
|
|
|
|
else if (myoptarg[0] == 'e') {
|
|
|
|
|
|
version = EITHER_DOWNGRADE_VERSION;
|
2018-12-27 11:08:30 -08:00
|
|
|
|
#ifndef NO_CERTS
|
2018-10-09 12:54:41 -07:00
|
|
|
|
loadCertKeyIntoSSLObj = 1;
|
2018-12-27 11:08:30 -08:00
|
|
|
|
#endif
|
2018-10-04 14:48:53 -07:00
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2012-08-01 17:33:49 -07:00
|
|
|
|
version = atoi(myoptarg);
|
2016-11-24 01:31:07 +10:00
|
|
|
|
if (version < 0 || version > 4) {
|
2012-08-01 12:55:13 -07:00
|
|
|
|
Usage();
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
2012-08-01 12:55:13 -07:00
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2015-11-02 13:26:46 -08:00
|
|
|
|
case 'V' :
|
|
|
|
|
|
ShowVersions();
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(EXIT_SUCCESS);
|
2015-11-02 13:26:46 -08:00
|
|
|
|
|
2012-08-01 12:55:13 -07:00
|
|
|
|
case 'l' :
|
2012-08-01 17:33:49 -07:00
|
|
|
|
cipherList = myoptarg;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
break;
|
|
|
|
|
|
|
2017-04-05 11:21:11 -07:00
|
|
|
|
case 'H' :
|
2022-05-10 12:20:12 -05:00
|
|
|
|
if (XSTRCMP(myoptarg, "defCipherList") == 0) {
|
2017-10-19 16:17:51 -07:00
|
|
|
|
printf("Using default cipher list for testing\n");
|
|
|
|
|
|
useDefCipherList = 1;
|
|
|
|
|
|
}
|
2022-05-10 12:20:12 -05:00
|
|
|
|
else if (XSTRCMP(myoptarg, "exitWithRet") == 0) {
|
2018-05-03 09:40:51 -07:00
|
|
|
|
printf("Skip exit() for testing\n");
|
2018-05-03 10:02:59 -07:00
|
|
|
|
exitWithRet = 1;
|
2017-10-19 16:17:51 -07:00
|
|
|
|
}
|
2022-05-10 12:20:12 -05:00
|
|
|
|
else if (XSTRCMP(myoptarg, "verifyFail") == 0) {
|
2018-08-29 10:55:12 -07:00
|
|
|
|
printf("Verify should fail\n");
|
2020-06-18 09:26:50 -07:00
|
|
|
|
myVerifyAction = VERIFY_FORCE_FAIL;
|
|
|
|
|
|
}
|
2022-05-10 12:20:12 -05:00
|
|
|
|
else if (XSTRCMP(myoptarg, "verifyInfo") == 0) {
|
2020-06-18 09:26:50 -07:00
|
|
|
|
printf("Verify should not override error\n");
|
|
|
|
|
|
myVerifyAction = VERIFY_USE_PREVERFIY;
|
2018-08-29 10:55:12 -07:00
|
|
|
|
}
|
2022-05-10 12:20:12 -05:00
|
|
|
|
else if (XSTRCMP(myoptarg, "useSupCurve") == 0) {
|
2019-03-11 09:57:04 -06:00
|
|
|
|
printf("Attempting to test use supported curve\n");
|
2019-03-01 16:12:08 -08:00
|
|
|
|
#if defined(HAVE_ECC) && defined(HAVE_SUPPORTED_CURVES)
|
2018-09-21 09:27:48 -07:00
|
|
|
|
useSupCurve = 1;
|
2019-03-11 09:57:04 -06:00
|
|
|
|
#else
|
|
|
|
|
|
printf("Supported curves not compiled in!\n");
|
2019-03-01 16:12:08 -08:00
|
|
|
|
#endif
|
2018-09-21 09:27:48 -07:00
|
|
|
|
}
|
2022-05-10 12:20:12 -05:00
|
|
|
|
else if (XSTRCMP(myoptarg, "loadSSL") == 0) {
|
2018-10-09 12:54:41 -07:00
|
|
|
|
printf("Load cert/key into wolfSSL object\n");
|
2018-12-27 11:08:30 -08:00
|
|
|
|
#ifndef NO_CERTS
|
2018-10-09 12:54:41 -07:00
|
|
|
|
loadCertKeyIntoSSLObj = 1;
|
2019-03-11 09:57:04 -06:00
|
|
|
|
#else
|
|
|
|
|
|
printf("Certs turned off with NO_CERTS!\n");
|
2018-12-27 11:08:30 -08:00
|
|
|
|
#endif
|
2018-10-09 12:54:41 -07:00
|
|
|
|
}
|
2022-05-10 12:20:12 -05:00
|
|
|
|
else if (XSTRCMP(myoptarg, "disallowETM") == 0) {
|
2020-07-21 13:34:25 -07:00
|
|
|
|
printf("Disallow Encrypt-Then-MAC\n");
|
2019-08-22 09:33:38 +10:00
|
|
|
|
#ifdef HAVE_ENCRYPT_THEN_MAC
|
|
|
|
|
|
disallowETM = 1;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
2017-10-19 16:17:51 -07:00
|
|
|
|
else {
|
|
|
|
|
|
Usage();
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
2017-10-19 16:17:51 -07:00
|
|
|
|
}
|
2017-04-05 11:21:11 -07:00
|
|
|
|
break;
|
|
|
|
|
|
|
2012-08-01 12:55:13 -07:00
|
|
|
|
case 'A' :
|
2022-03-08 14:52:40 +01:00
|
|
|
|
customVerifyCert = 1;
|
2012-08-01 17:33:49 -07:00
|
|
|
|
verifyCert = myoptarg;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'c' :
|
2012-08-01 17:33:49 -07:00
|
|
|
|
ourCert = myoptarg;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'k' :
|
2012-08-01 17:33:49 -07:00
|
|
|
|
ourKey = myoptarg;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
break;
|
|
|
|
|
|
|
2015-05-21 10:11:21 -07:00
|
|
|
|
case 'Z' :
|
|
|
|
|
|
#ifndef NO_DH
|
|
|
|
|
|
minDhKeyBits = atoi(myoptarg);
|
|
|
|
|
|
if (minDhKeyBits <= 0 || minDhKeyBits > 16000) {
|
|
|
|
|
|
Usage();
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
2015-05-21 10:11:21 -07:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2012-08-01 12:55:13 -07:00
|
|
|
|
case 'b' :
|
2012-08-01 17:33:49 -07:00
|
|
|
|
benchmark = atoi(myoptarg);
|
2012-08-01 12:55:13 -07:00
|
|
|
|
if (benchmark < 0 || benchmark > 1000000) {
|
|
|
|
|
|
Usage();
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
2012-08-01 12:55:13 -07:00
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2015-10-14 19:13:45 -07:00
|
|
|
|
case 'B' :
|
2019-12-18 07:09:26 -08:00
|
|
|
|
throughput = atol(myoptarg);
|
2018-04-09 13:53:05 +10:00
|
|
|
|
for (; *myoptarg != '\0'; myoptarg++) {
|
|
|
|
|
|
if (*myoptarg == ',') {
|
|
|
|
|
|
block = atoi(myoptarg + 1);
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2020-01-15 22:15:38 +10:00
|
|
|
|
if (throughput == 0 || block <= 0) {
|
2015-10-14 19:13:45 -07:00
|
|
|
|
Usage();
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2012-10-17 13:13:58 -07:00
|
|
|
|
case 'N' :
|
|
|
|
|
|
nonBlocking = 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'r' :
|
|
|
|
|
|
resumeSession = 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2015-01-30 08:41:34 -07:00
|
|
|
|
case 'w' :
|
2015-02-18 08:00:25 -07:00
|
|
|
|
wc_shutdown = 1;
|
2015-01-30 08:41:34 -07:00
|
|
|
|
break;
|
|
|
|
|
|
|
2014-09-24 18:48:23 -07:00
|
|
|
|
case 'R' :
|
|
|
|
|
|
#ifdef HAVE_SECURE_RENEGOTIATION
|
|
|
|
|
|
scr = 1;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2014-09-29 15:32:41 -07:00
|
|
|
|
case 'i' :
|
|
|
|
|
|
#ifdef HAVE_SECURE_RENEGOTIATION
|
|
|
|
|
|
scr = 1;
|
|
|
|
|
|
forceScr = 1;
|
2022-05-10 12:20:12 -05:00
|
|
|
|
if (XSTRCMP(myoptarg, "scr-app-data") == 0) {
|
2020-09-30 13:46:23 +02:00
|
|
|
|
scrAppData = 1;
|
|
|
|
|
|
}
|
2014-09-29 15:32:41 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2013-04-08 16:01:52 -07:00
|
|
|
|
case 'z' :
|
2015-01-05 14:48:43 -07:00
|
|
|
|
#ifndef WOLFSSL_LEANPSK
|
|
|
|
|
|
wolfSSL_GetObjectSize();
|
2013-04-08 16:01:52 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2013-05-21 14:37:50 -07:00
|
|
|
|
case 'S' :
|
2022-05-10 12:20:12 -05:00
|
|
|
|
if (XSTRCMP(myoptarg, "check") == 0) {
|
2018-08-30 14:44:49 -06:00
|
|
|
|
#ifdef HAVE_SNI
|
|
|
|
|
|
printf("SNI is: ON\n");
|
|
|
|
|
|
#else
|
|
|
|
|
|
printf("SNI is: OFF\n");
|
|
|
|
|
|
#endif
|
|
|
|
|
|
XEXIT_T(EXIT_SUCCESS);
|
|
|
|
|
|
}
|
2013-05-21 14:37:50 -07:00
|
|
|
|
#ifdef HAVE_SNI
|
|
|
|
|
|
sniHostName = myoptarg;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2015-10-13 14:13:12 -07:00
|
|
|
|
case 'F' :
|
2013-07-23 15:42:43 -03:00
|
|
|
|
#ifdef HAVE_MAX_FRAGMENT
|
|
|
|
|
|
maxFragment = atoi(myoptarg);
|
2018-10-15 17:06:21 -07:00
|
|
|
|
if (maxFragment < WOLFSSL_MFL_MIN ||
|
|
|
|
|
|
maxFragment > WOLFSSL_MFL_MAX) {
|
2013-07-23 15:42:43 -03:00
|
|
|
|
Usage();
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
2013-07-23 15:42:43 -03:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'T' :
|
|
|
|
|
|
#ifdef HAVE_TRUNCATED_HMAC
|
|
|
|
|
|
truncatedHMAC = 1;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2016-09-01 15:17:46 -06:00
|
|
|
|
case 'n' :
|
|
|
|
|
|
#ifdef HAVE_EXTENDED_MASTER
|
2016-09-09 23:16:52 -07:00
|
|
|
|
disableExtMasterSecret = 1;
|
2016-09-01 15:17:46 -06:00
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2015-11-02 15:51:01 -03:00
|
|
|
|
case 'W' :
|
2015-12-28 19:38:04 -03:00
|
|
|
|
#if defined(HAVE_CERTIFICATE_STATUS_REQUEST) \
|
|
|
|
|
|
|| defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2)
|
2020-10-21 13:30:51 -07:00
|
|
|
|
{
|
|
|
|
|
|
word32 myoptargSz;
|
|
|
|
|
|
|
2015-12-28 19:38:04 -03:00
|
|
|
|
statusRequest = atoi(myoptarg);
|
2018-08-02 16:25:38 -07:00
|
|
|
|
if (statusRequest > OCSP_STAPLING_OPT_MAX) {
|
|
|
|
|
|
Usage();
|
|
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
|
|
|
|
|
}
|
2020-10-21 13:30:51 -07:00
|
|
|
|
|
|
|
|
|
|
myoptargSz = (word32)XSTRLEN(myoptarg);
|
|
|
|
|
|
if (myoptargSz > 0 &&
|
jumbo patch of fixes for clang-tidy gripes (with some bug fixes).
defect/gripe statistics:
configured --enable-all --enable-sp-math-all --enable-intelasm
with LLVM 13 clang-tidy -checks=readability-*,bugprone-*,misc-no-recursion,misc-misplaced-const,misc-redundant-expression,misc-unused-parameters,misc-unused-using-decls,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-clang-analyzer-optin.performance.Padding,-readability-braces-around-statements,-readability-function-size,-readability-function-cognitive-complexity,-bugprone-suspicious-include,-bugprone-easily-swappable-parameters,-readability-isolate-declaration,-readability-magic-numbers,-readability-else-after-return,-bugprone-reserved-identifier,-readability-suspicious-call-argument,-bugprone-suspicious-string-compare,-bugprone-branch-clone,-misc-redundant-expression,-readability-non-const-parameter,-readability-redundant-control-flow,-readability-misleading-indentation,-bugprone-narrowing-conversions,-bugprone-implicit-widening-of-multiplication-result
[note these figures don't reflect additional defects fixed in this commit for --enable-smallstack, --enable-fips, --enable-async, --enable-asn=template, and --enable-fastmath, and --disable-fastmath]
pre-patch warning count per file, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 6 wolfssl/tests/suites.c
clang-analyzer-security.insecureAPI.strcpy 2 wolfssl/testsuite/testsuite.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/server/server.c
bugprone-suspicious-missing-comma 3 wolfssl/examples/client/client.c
readability-redundant-preprocessor 2 wolfssl/wolfcrypt/src/asn.c
readability-redundant-preprocessor 1 wolfssl/wolfcrypt/src/rsa.c
readability-redundant-preprocessor 9 wolfssl/src/ssl.c
readability-redundant-preprocessor 2 wolfssl/src/tls13.c
readability-redundant-preprocessor 18 wolfssl/tests/api.c
readability-redundant-preprocessor 3 wolfssl/src/internal.c
readability-redundant-preprocessor 10 wolfssl/wolfcrypt/test/test.c
readability-named-parameter 1 wolfssl/wolfcrypt/benchmark/benchmark.c
readability-named-parameter 7 wolfssl/src/internal.c
readability-named-parameter 1 wolfssl/wolfcrypt/src/ecc.c
readability-named-parameter 1 wolfssl/testsuite/testsuite.c
readability-named-parameter 11 wolfssl/wolfcrypt/src/ge_operations.c
misc-no-recursion 3 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 4 wolfssl/wolfcrypt/src/asn.c
readability-uppercase-literal-suffix 1 wolfssl/src/ssl.c
readability-uppercase-literal-suffix 13 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-too-small-loop-variable 1 wolfssl/wolfcrypt/src/rsa.c
bugprone-too-small-loop-variable 2 wolfssl/wolfcrypt/src/sha3.c
bugprone-too-small-loop-variable 4 wolfssl/wolfcrypt/src/idea.c
bugprone-signed-char-misuse 2 wolfssl/src/ssl.c
bugprone-signed-char-misuse 3 wolfssl/wolfcrypt/src/sp_int.c
bugprone-signed-char-misuse 3 wolfssl/examples/client/client.c
bugprone-macro-parentheses 19 wolfssl/wolfcrypt/src/aes.c
bugprone-macro-parentheses 109 wolfssl/wolfcrypt/src/camellia.c
bugprone-macro-parentheses 1 wolfssl/src/tls.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/md4.c
bugprone-macro-parentheses 2 wolfssl/wolfcrypt/src/asn.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2b.c
bugprone-macro-parentheses 257 wolfssl/wolfcrypt/src/sha3.c
bugprone-macro-parentheses 15 wolfssl/src/ssl.c
bugprone-macro-parentheses 1 wolfssl/wolfcrypt/src/sha.c
bugprone-macro-parentheses 8 wolfssl/tests/api.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/sp_int.c
bugprone-macro-parentheses 6 wolfssl/wolfcrypt/benchmark/benchmark.c
bugprone-macro-parentheses 38 wolfssl/wolfcrypt/src/hc128.c
bugprone-macro-parentheses 12 wolfssl/wolfcrypt/src/md5.c
bugprone-macro-parentheses 10 wolfssl/wolfcrypt/src/sha256.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/test/test.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/ecc.c
bugprone-macro-parentheses 2 wolfssl/tests/suites.c
bugprone-macro-parentheses 4 wolfssl/wolfcrypt/src/cpuid.c
bugprone-macro-parentheses 26 wolfssl/wolfcrypt/src/blake2s.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/sha512.c
bugprone-macro-parentheses 3 wolfssl/wolfcrypt/src/poly1305.c
bugprone-macro-parentheses 24 wolfssl/wolfcrypt/src/ripemd.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/src/internal.c
readability-inconsistent-declaration-parameter-name 1 wolfssl/testsuite/testsuite.c
pre-patch warning count summaries, with suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-suspicious-missing-comma 6
readability-redundant-preprocessor 45
readability-named-parameter 21
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-too-small-loop-variable 7
bugprone-signed-char-misuse 8
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
pre-patch warning count summaries, without suppressions:
clang-analyzer-security.insecureAPI.strcpy 8
bugprone-branch-clone 152
readability-non-const-parameter 118
bugprone-suspicious-missing-comma 6
bugprone-suspicious-include 52
readability-magic-numbers 22423
readability-redundant-preprocessor 45
readability-named-parameter 21
readability-function-cognitive-complexity 845
readability-else-after-return 398
bugprone-implicit-widening-of-multiplication-result 595
readability-function-size 21
readability-isolate-declaration 1090
misc-redundant-expression 2
bugprone-narrowing-conversions 994
misc-no-recursion 3
readability-uppercase-literal-suffix 18
bugprone-reserved-identifier 56
readability-suspicious-call-argument 74
bugprone-too-small-loop-variable 7
bugprone-easily-swappable-parameters 437
bugprone-signed-char-misuse 8
readability-misleading-indentation 94
bugprone-macro-parentheses 601
readability-inconsistent-declaration-parameter-name 2
bugprone-suspicious-string-compare 495
readability-redundant-control-flow 20
readability-braces-around-statements 11483
clang-analyzer-valist.Uninitialized 1
clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling 3502
2022-01-19 23:09:50 -06:00
|
|
|
|
XTOUPPER((unsigned char)myoptarg[myoptargSz-1]) == 'M') {
|
2020-10-15 17:27:58 +10:00
|
|
|
|
mustStaple = 1;
|
|
|
|
|
|
}
|
2020-10-21 13:30:51 -07:00
|
|
|
|
}
|
2015-11-02 15:51:01 -03:00
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2013-06-20 11:07:54 -07:00
|
|
|
|
case 'o' :
|
|
|
|
|
|
#ifdef HAVE_OCSP
|
|
|
|
|
|
useOcsp = 1;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'O' :
|
|
|
|
|
|
#ifdef HAVE_OCSP
|
|
|
|
|
|
useOcsp = 1;
|
|
|
|
|
|
ocspUrl = myoptarg;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2014-12-01 11:44:32 -08:00
|
|
|
|
case 'a' :
|
|
|
|
|
|
#ifdef HAVE_ANON
|
|
|
|
|
|
useAnon = 1;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2015-10-15 09:48:07 -07:00
|
|
|
|
case 'L' :
|
2015-10-13 15:00:53 -07:00
|
|
|
|
#ifdef HAVE_ALPN
|
|
|
|
|
|
alpnList = myoptarg;
|
|
|
|
|
|
|
|
|
|
|
|
if (alpnList[0] == 'C' && alpnList[1] == ':')
|
|
|
|
|
|
alpn_opt = WOLFSSL_ALPN_CONTINUE_ON_MISMATCH;
|
|
|
|
|
|
else if (alpnList[0] == 'F' && alpnList[1] == ':')
|
|
|
|
|
|
alpn_opt = WOLFSSL_ALPN_FAILED_ON_MISMATCH;
|
|
|
|
|
|
else {
|
|
|
|
|
|
Usage();
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
2015-10-13 15:00:53 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
alpnList += 2;
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2016-04-22 13:46:54 -06:00
|
|
|
|
case 'M' :
|
|
|
|
|
|
doSTARTTLS = 1;
|
|
|
|
|
|
starttlsProt = myoptarg;
|
|
|
|
|
|
|
2022-05-10 12:20:12 -05:00
|
|
|
|
if (XSTRCMP(starttlsProt, "smtp") != 0) {
|
2016-04-22 13:46:54 -06:00
|
|
|
|
Usage();
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
2016-04-22 13:46:54 -06:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2016-05-05 15:31:25 -06:00
|
|
|
|
case 'q' :
|
|
|
|
|
|
#ifdef HAVE_WNR
|
|
|
|
|
|
wnrConfigFile = myoptarg;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2017-04-14 16:39:21 -07:00
|
|
|
|
case 'J' :
|
2016-11-24 01:31:07 +10:00
|
|
|
|
#ifdef WOLFSSL_TLS13
|
|
|
|
|
|
helloRetry = 1;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'K' :
|
|
|
|
|
|
#ifdef WOLFSSL_TLS13
|
|
|
|
|
|
noPskDheKe = 1;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'I' :
|
|
|
|
|
|
#ifdef WOLFSSL_TLS13
|
|
|
|
|
|
updateKeysIVs = 1;
|
|
|
|
|
|
#endif
|
2017-05-08 12:49:38 -07:00
|
|
|
|
break;
|
2016-11-24 01:31:07 +10:00
|
|
|
|
|
|
|
|
|
|
case 'y' :
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#if defined(WOLFSSL_TLS13) && \
|
|
|
|
|
|
defined(HAVE_SUPPORTED_CURVES) && !defined(NO_DH)
|
2016-11-24 01:31:07 +10:00
|
|
|
|
onlyKeyShare = 1;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'Y' :
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#if defined(WOLFSSL_TLS13) && \
|
|
|
|
|
|
defined(HAVE_SUPPORTED_CURVES) && defined(HAVE_ECC)
|
2016-11-24 01:31:07 +10:00
|
|
|
|
onlyKeyShare = 2;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2017-05-11 12:23:17 -07:00
|
|
|
|
case 'j' :
|
|
|
|
|
|
useVerifyCb = 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2017-05-19 10:58:43 +10:00
|
|
|
|
case 't' :
|
|
|
|
|
|
#ifdef HAVE_CURVE25519
|
|
|
|
|
|
useX25519 = 1;
|
2018-11-08 15:43:18 -08:00
|
|
|
|
#ifdef HAVE_ECC
|
2018-09-21 09:27:48 -07:00
|
|
|
|
useSupCurve = 1;
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#if defined(WOLFSSL_TLS13) && \
|
|
|
|
|
|
defined(HAVE_SUPPORTED_CURVES)
|
2017-06-08 10:32:51 +10:00
|
|
|
|
onlyKeyShare = 2;
|
2018-11-08 15:43:18 -08:00
|
|
|
|
#endif
|
2017-06-08 10:32:51 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'Q' :
|
|
|
|
|
|
#if defined(WOLFSSL_TLS13) && \
|
|
|
|
|
|
defined(WOLFSSL_POST_HANDSHAKE_AUTH)
|
|
|
|
|
|
postHandAuth = 1;
|
2017-05-19 10:58:43 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2017-06-19 11:37:10 +10:00
|
|
|
|
case '0' :
|
|
|
|
|
|
#ifdef WOLFSSL_EARLY_DATA
|
|
|
|
|
|
earlyData = 1;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
2018-12-03 13:53:44 -08:00
|
|
|
|
|
2018-10-20 13:40:01 +09:00
|
|
|
|
case '1' :
|
|
|
|
|
|
lng_index = atoi(myoptarg);
|
|
|
|
|
|
if(lng_index<0||lng_index>1){
|
|
|
|
|
|
lng_index = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
2018-12-03 13:53:44 -08:00
|
|
|
|
|
|
|
|
|
|
case '2' :
|
|
|
|
|
|
#if !defined(NO_DH) && !defined(HAVE_FIPS) && \
|
|
|
|
|
|
!defined(HAVE_SELFTEST) && !defined(WOLFSSL_OLD_PRIME_CHECK)
|
|
|
|
|
|
doDhKeyCheck = 0;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2016-12-15 11:43:15 -08:00
|
|
|
|
case '3' :
|
|
|
|
|
|
#ifdef WOLFSSL_MULTICAST
|
|
|
|
|
|
doMcast = 1;
|
|
|
|
|
|
mcastID = (byte)(atoi(myoptarg) & 0xFF);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
2019-02-19 15:04:22 -08:00
|
|
|
|
case '4' :
|
|
|
|
|
|
#ifdef HAVE_SECURE_RENEGOTIATION
|
|
|
|
|
|
scr = 1;
|
|
|
|
|
|
forceScr = 1;
|
|
|
|
|
|
resumeScr = 1;
|
|
|
|
|
|
#endif
|
2019-03-13 22:59:50 -07:00
|
|
|
|
break;
|
2018-09-28 09:05:59 -07:00
|
|
|
|
|
|
|
|
|
|
case '5' :
|
|
|
|
|
|
#ifdef HAVE_TRUSTED_CA
|
|
|
|
|
|
trustedCaKeyId = 1;
|
|
|
|
|
|
#endif /* HAVE_TRUSTED_CA */
|
2019-02-19 15:04:22 -08:00
|
|
|
|
break;
|
|
|
|
|
|
|
2020-11-02 08:23:36 -06:00
|
|
|
|
case '6' :
|
2022-05-27 23:23:18 +02:00
|
|
|
|
#ifdef WOLFSSL_ASYNC_IO
|
2020-11-02 08:23:36 -06:00
|
|
|
|
nonBlocking = 1;
|
|
|
|
|
|
simulateWantWrite = 1;
|
2022-05-27 23:23:18 +02:00
|
|
|
|
#else
|
|
|
|
|
|
fprintf(stderr, "Ignoring -6 since async I/O support not "
|
|
|
|
|
|
"compiled in.\n");
|
|
|
|
|
|
#endif
|
2020-11-02 08:23:36 -06:00
|
|
|
|
break;
|
2021-04-28 10:28:35 -07:00
|
|
|
|
|
2021-04-22 14:52:57 -07:00
|
|
|
|
case '7' :
|
|
|
|
|
|
minVersion = atoi(myoptarg);
|
|
|
|
|
|
if (minVersion < 0 || minVersion > 4) {
|
|
|
|
|
|
Usage();
|
|
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
2021-04-28 10:28:35 -07:00
|
|
|
|
|
2020-02-19 18:07:45 +10:00
|
|
|
|
case '8' :
|
|
|
|
|
|
#ifdef HAVE_CURVE448
|
|
|
|
|
|
useX448 = 1;
|
|
|
|
|
|
#ifdef HAVE_ECC
|
|
|
|
|
|
useSupCurve = 1;
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#if defined(WOLFSSL_TLS13) && \
|
|
|
|
|
|
defined(HAVE_SUPPORTED_CURVES)
|
2020-02-19 18:07:45 +10:00
|
|
|
|
onlyKeyShare = 2;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
2021-02-15 15:47:03 +09:00
|
|
|
|
case '9' :
|
|
|
|
|
|
#if defined(OPENSSL_ALL) && defined(WOLFSSL_CERT_GEN) && \
|
2021-03-11 15:43:54 +09:00
|
|
|
|
(defined(WOLFSSL_CERT_REQ) || defined(WOLFSSL_CERT_EXT)) && \
|
2021-02-15 15:47:03 +09:00
|
|
|
|
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR)
|
|
|
|
|
|
useCertFolder = 1;
|
|
|
|
|
|
#endif
|
2021-06-16 00:26:48 -05:00
|
|
|
|
break;
|
2020-10-23 00:31:13 -05:00
|
|
|
|
case '@' :
|
|
|
|
|
|
{
|
2020-10-23 15:27:10 -05:00
|
|
|
|
#ifdef HAVE_WC_INTROSPECTION
|
2020-10-27 18:38:29 -05:00
|
|
|
|
const char *conf_args = wolfSSL_configure_args();
|
2020-10-23 15:27:10 -05:00
|
|
|
|
if (conf_args) {
|
|
|
|
|
|
puts(conf_args);
|
|
|
|
|
|
XEXIT_T(EXIT_SUCCESS);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
fputs("configure args not compiled in.\n",stderr);
|
|
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
fputs("compiled without BUILD_INTROSPECTION.\n",stderr);
|
|
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
|
|
|
|
|
#endif
|
2020-10-23 00:31:13 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
case '#' :
|
|
|
|
|
|
{
|
2020-10-23 15:27:10 -05:00
|
|
|
|
#ifdef HAVE_WC_INTROSPECTION
|
2020-10-27 18:38:29 -05:00
|
|
|
|
const char *cflags = wolfSSL_global_cflags();
|
2020-10-23 15:27:10 -05:00
|
|
|
|
if (cflags) {
|
|
|
|
|
|
puts(cflags);
|
|
|
|
|
|
XEXIT_T(EXIT_SUCCESS);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
fputs("CFLAGS not compiled in.\n",stderr);
|
|
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
fputs("compiled without BUILD_INTROSPECTION.\n",stderr);
|
|
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
|
|
|
|
|
#endif
|
2020-10-23 00:31:13 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
2021-06-16 00:26:48 -05:00
|
|
|
|
#ifdef WOLFSSL_WOLFSENTRY_HOOKS
|
|
|
|
|
|
case 256:
|
|
|
|
|
|
#if !defined(NO_FILESYSTEM) && !defined(WOLFSENTRY_NO_JSON)
|
|
|
|
|
|
wolfsentry_config_path = myoptarg;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2021-04-28 10:28:35 -07:00
|
|
|
|
#if defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES) && \
|
2021-12-20 11:26:25 -05:00
|
|
|
|
defined(HAVE_PQC)
|
2021-04-28 10:28:35 -07:00
|
|
|
|
case 259:
|
2021-12-20 11:26:25 -05:00
|
|
|
|
usePqc = 1;
|
2021-04-28 10:28:35 -07:00
|
|
|
|
onlyKeyShare = 3;
|
2021-12-20 11:26:25 -05:00
|
|
|
|
pqcAlg = myoptarg;
|
2021-04-28 10:28:35 -07:00
|
|
|
|
break;
|
2022-09-30 10:02:56 -07:00
|
|
|
|
#endif
|
2022-10-07 11:19:34 -07:00
|
|
|
|
#ifdef WOLFSSL_SYS_CA_CERTS
|
2022-09-30 10:02:56 -07:00
|
|
|
|
case 263:
|
|
|
|
|
|
loadSysCaCerts = 1;
|
|
|
|
|
|
break;
|
2021-04-28 10:28:35 -07:00
|
|
|
|
#endif
|
2023-01-24 12:00:37 +10:00
|
|
|
|
case 264:
|
|
|
|
|
|
#ifdef HAVE_SUPPORTED_CURVES
|
|
|
|
|
|
#ifdef WOLFSSL_TLS13
|
|
|
|
|
|
onlyPskDheKe = 1;
|
|
|
|
|
|
#endif
|
2023-04-24 17:03:34 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 265:
|
|
|
|
|
|
#ifndef NO_PSK
|
|
|
|
|
|
opensslPsk = 1;
|
2023-01-24 12:00:37 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
break;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
default:
|
|
|
|
|
|
Usage();
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(MY_EX_USAGE);
|
2012-08-01 12:55:13 -07:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2012-08-01 17:33:49 -07:00
|
|
|
|
myoptind = 0; /* reset for test cases */
|
2015-10-29 13:39:02 -06:00
|
|
|
|
#endif /* !WOLFSSL_VXWORKS */
|
2012-08-01 12:55:13 -07:00
|
|
|
|
|
2015-05-07 12:50:27 -07:00
|
|
|
|
if (externalTest) {
|
|
|
|
|
|
/* detect build cases that wouldn't allow test against wolfssl.com */
|
|
|
|
|
|
int done = 0;
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef NO_RSA
|
2018-12-21 08:21:59 -08:00
|
|
|
|
done += 1; /* require RSA for external tests */
|
2015-05-07 12:50:27 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2022-05-10 12:20:12 -05:00
|
|
|
|
if (!XSTRCMP(domain, "www.globalsign.com")) {
|
2015-12-29 17:05:51 -07:00
|
|
|
|
/* www.globalsign.com does not respond to ipv6 ocsp requests */
|
|
|
|
|
|
#if defined(TEST_IPV6) && defined(HAVE_OCSP)
|
2016-02-08 19:54:22 -08:00
|
|
|
|
done += 1;
|
2015-12-29 17:05:51 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* www.globalsign.com has limited supported cipher suites */
|
|
|
|
|
|
#if defined(NO_AES) && defined(HAVE_OCSP)
|
2016-02-08 19:54:22 -08:00
|
|
|
|
done += 1;
|
2015-12-29 17:05:51 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2015-12-31 12:05:45 -07:00
|
|
|
|
/* www.globalsign.com only supports static RSA or ECDHE with AES */
|
|
|
|
|
|
/* We cannot expect users to have on static RSA so test for ECC only
|
|
|
|
|
|
* as some users will most likely be on 32-bit systems where ECC
|
|
|
|
|
|
* is not enabled by default */
|
|
|
|
|
|
#if defined(HAVE_OCSP) && !defined(HAVE_ECC)
|
2016-02-08 19:54:22 -08:00
|
|
|
|
done += 1;
|
2015-12-31 12:05:45 -07:00
|
|
|
|
#endif
|
2018-12-21 08:21:59 -08:00
|
|
|
|
}
|
2015-12-31 12:05:45 -07:00
|
|
|
|
|
2015-05-07 12:50:27 -07:00
|
|
|
|
#ifndef NO_PSK
|
2018-12-21 08:21:59 -08:00
|
|
|
|
if (usePsk) {
|
2020-05-18 11:53:31 -07:00
|
|
|
|
done += 1; /* don't perform external tests if PSK is enabled */
|
2018-12-21 08:21:59 -08:00
|
|
|
|
}
|
2015-05-07 12:50:27 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2015-06-18 11:12:35 -07:00
|
|
|
|
#ifdef NO_SHA
|
2016-02-08 19:54:22 -08:00
|
|
|
|
done += 1; /* external cert chain most likely has SHA */
|
2015-06-18 11:12:35 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2016-02-09 17:06:06 -07:00
|
|
|
|
#if !defined(HAVE_ECC) && !defined(WOLFSSL_STATIC_RSA) \
|
2016-02-10 13:28:31 -07:00
|
|
|
|
|| ( defined(HAVE_ECC) && !defined(HAVE_SUPPORTED_CURVES) \
|
|
|
|
|
|
&& !defined(WOLFSSL_STATIC_RSA) )
|
2016-02-15 13:30:11 -07:00
|
|
|
|
/* google needs ECDHE+Supported Curves or static RSA */
|
2022-05-10 12:20:12 -05:00
|
|
|
|
if (!XSTRCASECMP(domain, "www.google.com"))
|
2016-02-15 13:30:11 -07:00
|
|
|
|
done += 1;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_ECC) && !defined(WOLFSSL_STATIC_RSA)
|
|
|
|
|
|
/* wolfssl needs ECDHE or static RSA */
|
2022-05-10 12:20:12 -05:00
|
|
|
|
if (!XSTRCASECMP(domain, "www.wolfssl.com"))
|
2016-02-08 19:54:22 -08:00
|
|
|
|
done += 1;
|
2015-08-14 12:58:00 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2016-01-14 20:25:50 -08:00
|
|
|
|
#if !defined(WOLFSSL_SHA384)
|
2022-05-10 12:20:12 -05:00
|
|
|
|
if (!XSTRCASECMP(domain, "www.wolfssl.com")) {
|
2016-02-07 08:27:01 -07:00
|
|
|
|
/* wolfssl need sha384 for cert chain verify */
|
2016-02-08 19:54:22 -08:00
|
|
|
|
done += 1;
|
2016-01-14 20:25:50 -08:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2015-09-28 09:47:59 -07:00
|
|
|
|
#if !defined(HAVE_AESGCM) && defined(NO_AES) && \
|
|
|
|
|
|
!(defined(HAVE_CHACHA) && defined(HAVE_POLY1305))
|
2018-12-21 08:21:59 -08:00
|
|
|
|
/* need at least one of these for external tests */
|
2016-02-08 19:54:22 -08:00
|
|
|
|
done += 1;
|
2015-09-28 09:47:59 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2018-03-01 15:22:38 -08:00
|
|
|
|
/* For the external test, if we disable AES, GoDaddy will reject the
|
|
|
|
|
|
* connection. They only currently support AES suites, RC4 and 3DES
|
|
|
|
|
|
* suites. With AES disabled we only offer PolyChacha suites. */
|
|
|
|
|
|
#if defined(NO_AES) && !defined(HAVE_AESGCM)
|
2022-05-10 12:20:12 -05:00
|
|
|
|
if (!XSTRCASECMP(domain, "www.wolfssl.com")) {
|
2018-03-01 15:22:38 -08:00
|
|
|
|
done += 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2015-05-07 12:50:27 -07:00
|
|
|
|
if (done) {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "external test can't be run in this mode\n");
|
2015-05-07 12:50:27 -07:00
|
|
|
|
|
|
|
|
|
|
((func_args*)args)->return_code = 0;
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(EXIT_SUCCESS);
|
2015-05-07 12:50:27 -07:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2013-03-07 22:52:51 -08:00
|
|
|
|
/* sort out DTLS versus TLS versions */
|
|
|
|
|
|
if (version == CLIENT_INVALID_VERSION) {
|
|
|
|
|
|
if (doDTLS)
|
|
|
|
|
|
version = CLIENT_DTLS_DEFAULT_VERSION;
|
|
|
|
|
|
else
|
|
|
|
|
|
version = CLIENT_DEFAULT_VERSION;
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
if (doDTLS) {
|
2022-05-20 10:00:24 +02:00
|
|
|
|
if (version == 3) {
|
2013-03-07 22:52:51 -08:00
|
|
|
|
version = -2;
|
2022-05-20 10:00:24 +02:00
|
|
|
|
}
|
2018-10-09 12:54:41 -07:00
|
|
|
|
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_EITHER_SIDE)
|
2022-05-20 10:00:24 +02:00
|
|
|
|
else if (version == EITHER_DOWNGRADE_VERSION) {
|
2018-10-09 12:54:41 -07:00
|
|
|
|
version = -3;
|
2022-05-20 10:00:24 +02:00
|
|
|
|
}
|
2018-10-09 12:54:41 -07:00
|
|
|
|
#endif
|
2022-05-20 10:00:24 +02:00
|
|
|
|
else if (version == 4) {
|
|
|
|
|
|
#ifdef WOLFSSL_DTLS13
|
|
|
|
|
|
version = -4;
|
|
|
|
|
|
#else
|
|
|
|
|
|
err_sys("Bad DTLS version");
|
|
|
|
|
|
#endif /* WOLFSSL_DTLS13 */
|
|
|
|
|
|
}
|
2022-07-04 17:00:15 +02:00
|
|
|
|
else if (version == 2)
|
2013-03-07 22:52:51 -08:00
|
|
|
|
version = -1;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2022-12-12 11:30:01 -05:00
|
|
|
|
#ifndef HAVE_SESSION_TICKET
|
|
|
|
|
|
if ((version >= 4) && resumeSession) {
|
|
|
|
|
|
fprintf(stderr, "Can't do TLS 1.3 resumption; need session tickets!\n");
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2016-05-05 15:31:25 -06:00
|
|
|
|
#ifdef HAVE_WNR
|
|
|
|
|
|
if (wc_InitNetRandom(wnrConfigFile, NULL, 5000) != 0)
|
|
|
|
|
|
err_sys("can't load whitewood net random config file");
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2021-12-20 11:26:25 -05:00
|
|
|
|
#ifdef HAVE_PQC
|
|
|
|
|
|
if (usePqc) {
|
2021-04-28 10:28:35 -07:00
|
|
|
|
if (version == CLIENT_DOWNGRADE_VERSION ||
|
|
|
|
|
|
version == EITHER_DOWNGRADE_VERSION)
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr,
|
|
|
|
|
|
"WARNING: If a TLS 1.3 connection is not negotiated, you "
|
2021-12-20 11:26:25 -05:00
|
|
|
|
"will not be using a post-quantum group.\n");
|
2022-08-30 18:39:57 +12:00
|
|
|
|
else if (version != 4 && version != -4)
|
|
|
|
|
|
err_sys("can only use post-quantum groups with TLS 1.3 or DTLS 1.3");
|
2021-04-28 10:28:35 -07:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2012-08-01 12:55:13 -07:00
|
|
|
|
switch (version) {
|
2012-11-26 18:40:43 -08:00
|
|
|
|
#ifndef NO_OLD_TLS
|
2015-08-12 16:39:13 -07:00
|
|
|
|
#ifdef WOLFSSL_ALLOW_SSLV3
|
2012-08-01 12:55:13 -07:00
|
|
|
|
case 0:
|
2017-10-20 14:56:29 -07:00
|
|
|
|
method = wolfSSLv3_client_method_ex;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
break;
|
2015-08-12 16:39:13 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2013-05-19 10:02:13 +09:00
|
|
|
|
#ifndef NO_TLS
|
2017-11-14 13:55:48 -08:00
|
|
|
|
#ifdef WOLFSSL_ALLOW_TLSV10
|
2012-08-01 12:55:13 -07:00
|
|
|
|
case 1:
|
2017-10-20 14:56:29 -07:00
|
|
|
|
method = wolfTLSv1_client_method_ex;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
break;
|
2017-11-14 13:55:48 -08:00
|
|
|
|
#endif
|
2012-08-01 12:55:13 -07:00
|
|
|
|
|
|
|
|
|
|
case 2:
|
2017-10-20 14:56:29 -07:00
|
|
|
|
method = wolfTLSv1_1_client_method_ex;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
break;
|
2017-11-14 13:55:48 -08:00
|
|
|
|
#endif /* !NO_TLS */
|
|
|
|
|
|
#endif /* !NO_OLD_TLS */
|
2015-08-12 16:39:13 -07:00
|
|
|
|
|
2013-05-19 10:02:13 +09:00
|
|
|
|
#ifndef NO_TLS
|
2018-05-17 09:08:03 +10:00
|
|
|
|
#ifndef WOLFSSL_NO_TLS12
|
2012-08-01 12:55:13 -07:00
|
|
|
|
case 3:
|
2017-10-20 14:56:29 -07:00
|
|
|
|
method = wolfTLSv1_2_client_method_ex;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
break;
|
2018-05-17 09:08:03 +10:00
|
|
|
|
#endif
|
2017-11-14 13:55:48 -08:00
|
|
|
|
|
2016-11-24 01:31:07 +10:00
|
|
|
|
#ifdef WOLFSSL_TLS13
|
|
|
|
|
|
case 4:
|
2017-10-20 14:56:29 -07:00
|
|
|
|
method = wolfTLSv1_3_client_method_ex;
|
2016-11-24 01:31:07 +10:00
|
|
|
|
break;
|
|
|
|
|
|
#endif
|
2018-02-22 11:05:58 +10:00
|
|
|
|
|
|
|
|
|
|
case CLIENT_DOWNGRADE_VERSION:
|
2022-07-04 17:00:15 +02:00
|
|
|
|
if (!doDTLS) {
|
|
|
|
|
|
method = wolfSSLv23_client_method_ex;
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
#ifdef WOLFSSL_DTLS
|
|
|
|
|
|
method = wolfDTLS_client_method_ex;
|
|
|
|
|
|
#else
|
|
|
|
|
|
err_sys("version not supported");
|
|
|
|
|
|
#endif /* WOLFSSL_DTLS */
|
|
|
|
|
|
}
|
2018-02-22 11:05:58 +10:00
|
|
|
|
break;
|
2018-10-04 14:48:53 -07:00
|
|
|
|
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_EITHER_SIDE)
|
|
|
|
|
|
case EITHER_DOWNGRADE_VERSION:
|
|
|
|
|
|
method = wolfSSLv23_method_ex;
|
|
|
|
|
|
break;
|
|
|
|
|
|
#endif
|
2017-11-14 13:55:48 -08:00
|
|
|
|
#endif /* NO_TLS */
|
2012-08-01 12:55:13 -07:00
|
|
|
|
|
2015-01-05 14:48:43 -07:00
|
|
|
|
#ifdef WOLFSSL_DTLS
|
2015-04-08 13:29:25 -07:00
|
|
|
|
#ifndef NO_OLD_TLS
|
2012-08-02 11:54:49 -07:00
|
|
|
|
case -1:
|
2017-10-20 14:56:29 -07:00
|
|
|
|
method = wolfDTLSv1_client_method_ex;
|
2012-08-02 11:54:49 -07:00
|
|
|
|
break;
|
2015-04-08 13:29:25 -07:00
|
|
|
|
#endif
|
2013-03-07 22:52:51 -08:00
|
|
|
|
|
2018-05-17 09:08:03 +10:00
|
|
|
|
#ifndef WOLFSSL_NO_TLS12
|
2013-03-07 22:52:51 -08:00
|
|
|
|
case -2:
|
2017-10-20 14:56:29 -07:00
|
|
|
|
method = wolfDTLSv1_2_client_method_ex;
|
2013-03-07 22:52:51 -08:00
|
|
|
|
break;
|
2018-05-17 09:08:03 +10:00
|
|
|
|
#endif
|
2022-05-20 10:00:24 +02:00
|
|
|
|
#ifdef WOLFSSL_DTLS13
|
|
|
|
|
|
case -4:
|
|
|
|
|
|
method = wolfDTLSv1_3_client_method_ex;
|
|
|
|
|
|
break;
|
|
|
|
|
|
#endif /* WOLFSSL_DTLS13 */
|
2018-10-09 12:54:41 -07:00
|
|
|
|
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_EITHER_SIDE)
|
|
|
|
|
|
case -3:
|
|
|
|
|
|
method = wolfDTLSv1_2_method_ex;
|
|
|
|
|
|
break;
|
|
|
|
|
|
#endif
|
2012-08-02 11:54:49 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2012-08-01 12:55:13 -07:00
|
|
|
|
default:
|
|
|
|
|
|
err_sys("Bad SSL version");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (method == NULL)
|
|
|
|
|
|
err_sys("unable to get method");
|
|
|
|
|
|
|
2017-10-20 14:56:29 -07:00
|
|
|
|
|
|
|
|
|
|
#ifdef WOLFSSL_STATIC_MEMORY
|
|
|
|
|
|
#ifdef DEBUG_WOLFSSL
|
|
|
|
|
|
/* print off helper buffer sizes for use with static memory
|
2019-12-24 12:29:33 -06:00
|
|
|
|
* printing to stderr in case of debug mode turned on */
|
2017-10-20 14:56:29 -07:00
|
|
|
|
fprintf(stderr, "static memory management size = %d\n",
|
|
|
|
|
|
wolfSSL_MemoryPaddingSz());
|
|
|
|
|
|
fprintf(stderr, "calculated optimum general buffer size = %d\n",
|
|
|
|
|
|
wolfSSL_StaticBufferSz(memory, sizeof(memory), 0));
|
|
|
|
|
|
fprintf(stderr, "calculated optimum IO buffer size = %d\n",
|
|
|
|
|
|
wolfSSL_StaticBufferSz(memoryIO, sizeof(memoryIO),
|
|
|
|
|
|
WOLFMEM_IO_POOL_FIXED));
|
|
|
|
|
|
#endif /* DEBUG_WOLFSSL */
|
|
|
|
|
|
|
2019-11-05 15:13:26 -07:00
|
|
|
|
if (wc_LoadStaticMemory(&heap, memory, sizeof(memory), WOLFMEM_GENERAL, 1)
|
|
|
|
|
|
!= 0) {
|
2017-10-20 14:56:29 -07:00
|
|
|
|
err_sys("unable to load static memory");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2019-11-05 15:13:26 -07:00
|
|
|
|
ctx = wolfSSL_CTX_new_ex(method(heap), heap);
|
|
|
|
|
|
if (ctx == NULL)
|
|
|
|
|
|
err_sys("unable to get ctx");
|
2022-10-11 13:14:59 -07:00
|
|
|
|
#ifdef WOLFSSL_CALLBACKS
|
|
|
|
|
|
wolfSSL_CTX_set_msg_callback(ctx, msgDebugCb);
|
|
|
|
|
|
#endif
|
2019-11-05 15:13:26 -07:00
|
|
|
|
|
2017-10-20 14:56:29 -07:00
|
|
|
|
if (wolfSSL_CTX_load_static_memory(&ctx, NULL, memoryIO, sizeof(memoryIO),
|
|
|
|
|
|
WOLFMEM_IO_POOL_FIXED | WOLFMEM_TRACK_STATS, 1) != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err_sys("unable to load static memory");
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
2021-01-20 11:34:02 -06:00
|
|
|
|
if (method != NULL) {
|
2021-01-18 16:18:49 -06:00
|
|
|
|
ctx = wolfSSL_CTX_new(method(NULL));
|
|
|
|
|
|
if (ctx == NULL)
|
|
|
|
|
|
err_sys("unable to get ctx");
|
|
|
|
|
|
}
|
2019-11-05 15:13:26 -07:00
|
|
|
|
#endif
|
2022-09-30 10:02:56 -07:00
|
|
|
|
|
2022-10-07 11:19:34 -07:00
|
|
|
|
#ifdef WOLFSSL_SYS_CA_CERTS
|
2022-09-30 10:02:56 -07:00
|
|
|
|
if (loadSysCaCerts &&
|
|
|
|
|
|
wolfSSL_CTX_load_system_CA_certs(ctx) != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err_sys("wolfSSL_CTX_load_system_CA_certs failed");
|
|
|
|
|
|
}
|
2022-10-07 11:19:34 -07:00
|
|
|
|
#endif /* WOLFSSL_SYS_CA_CERTS */
|
2022-09-30 10:02:56 -07:00
|
|
|
|
|
2021-06-30 13:52:46 +09:00
|
|
|
|
if (minVersion != CLIENT_INVALID_VERSION) {
|
2022-07-04 17:00:15 +02:00
|
|
|
|
#ifdef WOLFSSL_DTLS
|
|
|
|
|
|
if (doDTLS) {
|
|
|
|
|
|
switch (minVersion) {
|
|
|
|
|
|
case 4:
|
|
|
|
|
|
#ifdef WOLFSSL_DTLS13
|
|
|
|
|
|
minVersion = WOLFSSL_DTLSV1_3;
|
|
|
|
|
|
break;
|
|
|
|
|
|
#else
|
|
|
|
|
|
err_sys("invalid minimum downgrade version");
|
|
|
|
|
|
#endif /* WOLFSSL_DTLS13 */
|
|
|
|
|
|
case 3:
|
|
|
|
|
|
minVersion = WOLFSSL_DTLSV1_2;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 2:
|
|
|
|
|
|
minVersion = WOLFSSL_DTLSV1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif /* WOLFSSL_DTLS */
|
|
|
|
|
|
if (wolfSSL_CTX_SetMinVersion(ctx, minVersion) != WOLFSSL_SUCCESS)
|
|
|
|
|
|
err_sys("can't set minimum downgrade version");
|
2021-04-22 14:52:57 -07:00
|
|
|
|
}
|
|
|
|
|
|
if (simulateWantWrite) {
|
2021-05-06 11:07:05 -07:00
|
|
|
|
#ifdef USE_WOLFSSL_IO
|
2020-11-02 08:23:36 -06:00
|
|
|
|
wolfSSL_CTX_SetIOSend(ctx, SimulateWantWriteIOSendCb);
|
2021-05-06 11:07:05 -07:00
|
|
|
|
#endif
|
2020-11-02 08:23:36 -06:00
|
|
|
|
}
|
|
|
|
|
|
|
2016-09-16 13:35:29 -07:00
|
|
|
|
#ifdef SINGLE_THREADED
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_CTX_new_rng(ctx) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-09-16 13:35:29 -07:00
|
|
|
|
err_sys("Single Threaded new rng at CTX failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2021-04-20 16:15:42 +02:00
|
|
|
|
#ifdef OPENSSL_COMPATIBLE_DEFAULTS
|
|
|
|
|
|
/* Restore wolfSSL verify defaults */
|
|
|
|
|
|
if (ctx) {
|
|
|
|
|
|
wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_DEFAULT, NULL);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2021-06-16 00:26:48 -05:00
|
|
|
|
|
2022-01-14 13:43:29 -08:00
|
|
|
|
#ifdef WOLFSSL_SRTP
|
|
|
|
|
|
if (dtlsSrtpProfiles != NULL) {
|
|
|
|
|
|
if (wolfSSL_CTX_set_tlsext_use_srtp(ctx, dtlsSrtpProfiles)
|
2022-01-13 16:09:11 -08:00
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err_sys("unable to set DTLS SRTP profile");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2021-06-16 00:26:48 -05:00
|
|
|
|
#ifdef WOLFSSL_WOLFSENTRY_HOOKS
|
2021-06-21 15:09:39 -07:00
|
|
|
|
if (wolfsentry_setup(&wolfsentry, wolfsentry_config_path,
|
|
|
|
|
|
WOLFSENTRY_ROUTE_FLAG_DIRECTION_OUT) < 0) {
|
2021-06-16 00:26:48 -05:00
|
|
|
|
err_sys("unable to initialize wolfSentry");
|
2021-06-21 15:09:39 -07:00
|
|
|
|
}
|
2021-06-16 00:26:48 -05:00
|
|
|
|
|
|
|
|
|
|
if (wolfSSL_CTX_set_ConnectFilter(
|
|
|
|
|
|
ctx,
|
|
|
|
|
|
(NetworkFilterCallback_t)wolfSentry_NetworkFilterCallback,
|
2021-06-21 15:09:39 -07:00
|
|
|
|
wolfsentry) < 0) {
|
2021-06-16 00:26:48 -05:00
|
|
|
|
err_sys("unable to install wolfSentry_NetworkFilterCallback");
|
2021-06-21 15:09:39 -07:00
|
|
|
|
}
|
2021-06-16 00:26:48 -05:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2017-04-05 11:21:11 -07:00
|
|
|
|
if (cipherList && !useDefCipherList) {
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_CTX_set_cipher_list(ctx, cipherList) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2013-01-21 10:53:42 -08:00
|
|
|
|
err_sys("client can't set cipher list 1");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2015-10-14 19:13:45 -07:00
|
|
|
|
}
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2015-01-05 14:48:43 -07:00
|
|
|
|
#ifdef WOLFSSL_LEANPSK
|
2016-04-11 11:13:26 -06:00
|
|
|
|
if (!usePsk) {
|
|
|
|
|
|
usePsk = 1;
|
|
|
|
|
|
}
|
2012-10-30 12:51:14 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2020-02-19 18:07:45 +10:00
|
|
|
|
#if defined(NO_RSA) && !defined(HAVE_ECC) && !defined(HAVE_ED25519) && \
|
|
|
|
|
|
!defined(HAVE_ED448)
|
2016-04-11 11:13:26 -06:00
|
|
|
|
if (!usePsk) {
|
|
|
|
|
|
usePsk = 1;
|
|
|
|
|
|
}
|
2013-03-11 13:19:43 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2013-04-19 13:10:19 -07:00
|
|
|
|
if (fewerPackets)
|
2015-01-05 14:48:43 -07:00
|
|
|
|
wolfSSL_CTX_set_group_messages(ctx);
|
2021-04-12 20:02:18 +02:00
|
|
|
|
#if (defined(WOLFSSL_SCTP) || defined(WOLFSSL_DTLS_MTU)) && \
|
|
|
|
|
|
defined(WOLFSSL_DTLS)
|
|
|
|
|
|
if (dtlsMTU)
|
|
|
|
|
|
wolfSSL_CTX_dtls_set_mtu(ctx, dtlsMTU);
|
|
|
|
|
|
#endif
|
2013-04-19 13:10:19 -07:00
|
|
|
|
|
2015-05-21 10:11:21 -07:00
|
|
|
|
#ifndef NO_DH
|
2019-01-17 09:52:00 -08:00
|
|
|
|
if (wolfSSL_CTX_SetMinDhKey_Sz(ctx, (word16)minDhKeyBits)
|
|
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err_sys("Error setting minimum DH key size");
|
|
|
|
|
|
}
|
2015-05-21 10:11:21 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2012-10-30 12:51:14 -07:00
|
|
|
|
if (usePsk) {
|
2011-02-05 11:14:47 -08:00
|
|
|
|
#ifndef NO_PSK
|
2020-05-15 15:08:17 -07:00
|
|
|
|
const char *defaultCipherList = cipherList;
|
|
|
|
|
|
|
2015-01-05 14:48:43 -07:00
|
|
|
|
wolfSSL_CTX_set_psk_client_callback(ctx, my_psk_client_cb);
|
2021-03-01 16:39:17 +10:00
|
|
|
|
#ifdef WOLFSSL_TLS13
|
|
|
|
|
|
#if !defined(WOLFSSL_PSK_TLS13_CB) && !defined(WOLFSSL_PSK_ONE_ID)
|
2023-04-24 17:03:34 +10:00
|
|
|
|
if (!opensslPsk) {
|
|
|
|
|
|
wolfSSL_CTX_set_psk_client_cs_callback(ctx, my_psk_client_cs_cb);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
2018-08-14 08:55:57 +10:00
|
|
|
|
#endif
|
2023-04-24 17:03:34 +10:00
|
|
|
|
{
|
|
|
|
|
|
wolfSSL_CTX_set_psk_client_tls13_callback(ctx,
|
|
|
|
|
|
my_psk_client_tls13_cb);
|
|
|
|
|
|
}
|
2021-03-01 16:39:17 +10:00
|
|
|
|
#endif
|
2020-05-15 15:08:17 -07:00
|
|
|
|
if (defaultCipherList == NULL) {
|
2017-06-07 08:29:08 +10:00
|
|
|
|
#if defined(HAVE_AESGCM) && !defined(NO_DH)
|
|
|
|
|
|
#ifdef WOLFSSL_TLS13
|
2020-10-28 11:47:31 +10:00
|
|
|
|
defaultCipherList = "TLS13-AES128-GCM-SHA256"
|
|
|
|
|
|
#ifndef WOLFSSL_NO_TLS12
|
|
|
|
|
|
":DHE-PSK-AES128-GCM-SHA256"
|
|
|
|
|
|
#endif
|
|
|
|
|
|
;
|
2017-06-07 08:29:08 +10:00
|
|
|
|
#else
|
2015-03-27 14:28:05 -07:00
|
|
|
|
defaultCipherList = "DHE-PSK-AES128-GCM-SHA256";
|
2017-06-07 08:29:08 +10:00
|
|
|
|
#endif
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#elif defined(HAVE_AESGCM) && defined(WOLFSSL_TLS13)
|
|
|
|
|
|
defaultCipherList = "TLS13-AES128-GCM-SHA256"
|
|
|
|
|
|
#ifndef WOLFSSL_NO_TLS12
|
|
|
|
|
|
":PSK-AES128-GCM-SHA256"
|
|
|
|
|
|
#endif
|
|
|
|
|
|
;
|
2017-06-07 08:29:08 +10:00
|
|
|
|
#elif defined(HAVE_NULL_CIPHER)
|
2013-03-07 17:44:40 -08:00
|
|
|
|
defaultCipherList = "PSK-NULL-SHA256";
|
2022-09-12 11:21:01 +10:00
|
|
|
|
#elif !defined(NO_AES_CBC)
|
2013-03-11 13:19:43 -07:00
|
|
|
|
defaultCipherList = "PSK-AES128-CBC-SHA256";
|
2022-09-12 11:21:01 +10:00
|
|
|
|
#else
|
|
|
|
|
|
defaultCipherList = "PSK-AES128-GCM-SHA256";
|
2017-06-07 08:29:08 +10:00
|
|
|
|
#endif
|
2020-05-15 15:08:17 -07:00
|
|
|
|
if (wolfSSL_CTX_set_cipher_list(ctx, defaultCipherList)
|
2017-10-19 16:17:51 -07:00
|
|
|
|
!=WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2013-01-21 10:53:42 -08:00
|
|
|
|
err_sys("client can't set cipher list 2");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2012-10-30 12:51:14 -07:00
|
|
|
|
}
|
2020-05-15 15:08:17 -07:00
|
|
|
|
wolfSSL_CTX_set_psk_callback_ctx(ctx, (void*)defaultCipherList);
|
2011-02-05 11:14:47 -08:00
|
|
|
|
#endif
|
2016-04-11 11:13:26 -06:00
|
|
|
|
if (useClientCert) {
|
|
|
|
|
|
useClientCert = 0;
|
|
|
|
|
|
}
|
2012-10-30 12:51:14 -07:00
|
|
|
|
}
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2014-12-01 11:44:32 -08:00
|
|
|
|
if (useAnon) {
|
|
|
|
|
|
#ifdef HAVE_ANON
|
2017-04-05 14:35:33 -07:00
|
|
|
|
if (cipherList == NULL || (cipherList && useDefCipherList)) {
|
2018-04-20 10:35:37 -07:00
|
|
|
|
const char* defaultCipherList;
|
2015-01-05 14:48:43 -07:00
|
|
|
|
wolfSSL_CTX_allow_anon_cipher(ctx);
|
2018-04-20 10:35:37 -07:00
|
|
|
|
defaultCipherList = "ADH-AES256-GCM-SHA384:"
|
|
|
|
|
|
"ADH-AES128-SHA";
|
|
|
|
|
|
if (wolfSSL_CTX_set_cipher_list(ctx,defaultCipherList)
|
2017-10-19 16:17:51 -07:00
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2014-12-01 11:44:32 -08:00
|
|
|
|
err_sys("client can't set cipher list 4");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2014-12-01 11:44:32 -08:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2016-04-11 11:13:26 -06:00
|
|
|
|
if (useClientCert) {
|
|
|
|
|
|
useClientCert = 0;
|
|
|
|
|
|
}
|
2014-12-01 11:44:32 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
2016-08-26 10:47:01 -07:00
|
|
|
|
#ifdef WOLFSSL_SCTP
|
|
|
|
|
|
if (dtlsSCTP)
|
|
|
|
|
|
wolfSSL_CTX_dtls_set_sctp(ctx);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2018-03-30 15:48:15 -07:00
|
|
|
|
#ifdef WOLFSSL_ENCRYPTED_KEYS
|
2015-01-05 14:48:43 -07:00
|
|
|
|
wolfSSL_CTX_set_default_passwd_cb(ctx, PasswordCallBack);
|
2011-02-05 11:14:47 -08:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2020-07-09 13:52:49 -07:00
|
|
|
|
#ifdef WOLFSSL_SNIFFER
|
2020-06-04 16:42:40 -07:00
|
|
|
|
if (cipherList == NULL && version < 4) {
|
2020-07-09 13:52:49 -07:00
|
|
|
|
/* static RSA or ECC cipher suites */
|
|
|
|
|
|
const char* staticCipherList = "AES128-SHA:ECDH-ECDSA-AES128-SHA";
|
|
|
|
|
|
if (wolfSSL_CTX_set_cipher_list(ctx, staticCipherList) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2013-01-21 10:53:42 -08:00
|
|
|
|
err_sys("client can't set cipher list 3");
|
2012-10-30 12:51:14 -07:00
|
|
|
|
}
|
2012-08-31 13:28:07 -07:00
|
|
|
|
}
|
2011-04-29 10:41:21 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2013-06-20 11:07:54 -07:00
|
|
|
|
#ifdef HAVE_OCSP
|
|
|
|
|
|
if (useOcsp) {
|
2021-05-06 11:07:05 -07:00
|
|
|
|
#if defined(HAVE_IO_TIMEOUT) && defined(HAVE_HTTP_CLIENT)
|
2017-03-06 09:49:05 -08:00
|
|
|
|
wolfIO_SetTimeout(DEFAULT_TIMEOUT_SEC);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2013-12-17 18:26:29 -08:00
|
|
|
|
if (ocspUrl != NULL) {
|
2015-01-05 14:48:43 -07:00
|
|
|
|
wolfSSL_CTX_SetOCSP_OverrideURL(ctx, ocspUrl);
|
|
|
|
|
|
wolfSSL_CTX_EnableOCSP(ctx, WOLFSSL_OCSP_NO_NONCE
|
|
|
|
|
|
| WOLFSSL_OCSP_URL_OVERRIDE);
|
2013-12-17 18:26:29 -08:00
|
|
|
|
}
|
2017-12-08 03:12:33 +01:00
|
|
|
|
else {
|
2017-12-19 16:52:47 -08:00
|
|
|
|
wolfSSL_CTX_EnableOCSP(ctx, WOLFSSL_OCSP_CHECKALL);
|
2017-12-08 03:12:33 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef WOLFSSL_NONBLOCK_OCSP
|
|
|
|
|
|
wolfSSL_CTX_SetOCSP_Cb(ctx, OCSPIOCb, OCSPRespFreeCb, NULL);
|
|
|
|
|
|
#endif
|
2013-06-20 11:07:54 -07:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2012-01-26 12:52:54 -08:00
|
|
|
|
#ifdef USER_CA_CB
|
2015-01-05 14:48:43 -07:00
|
|
|
|
wolfSSL_CTX_SetCACb(ctx, CaCb);
|
2012-01-26 12:52:54 -08:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2020-06-30 21:21:43 +02:00
|
|
|
|
#if defined(HAVE_EXT_CACHE) && !defined(NO_SESSION_CACHE)
|
2018-04-05 07:10:04 -07:00
|
|
|
|
wolfSSL_CTX_sess_set_get_cb(ctx, mySessGetCb);
|
|
|
|
|
|
wolfSSL_CTX_sess_set_new_cb(ctx, mySessNewCb);
|
|
|
|
|
|
wolfSSL_CTX_sess_set_remove_cb(ctx, mySessRemCb);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#ifndef NO_CERTS
|
2018-10-09 12:54:41 -07:00
|
|
|
|
if (useClientCert && !loadCertKeyIntoSSLObj){
|
2021-08-23 16:29:30 -06:00
|
|
|
|
#if defined(NO_FILESYSTEM) && defined(USE_CERT_BUFFERS_2048)
|
|
|
|
|
|
if (wolfSSL_CTX_use_certificate_chain_buffer_format(ctx,
|
|
|
|
|
|
client_cert_der_2048, sizeof_client_cert_der_2048,
|
|
|
|
|
|
WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS)
|
2021-03-08 17:31:12 -06:00
|
|
|
|
err_sys("can't load client cert buffer");
|
2020-10-09 09:45:00 -07:00
|
|
|
|
#elif !defined(TEST_LOAD_BUFFER)
|
2017-01-10 09:26:47 +10:00
|
|
|
|
if (wolfSSL_CTX_use_certificate_chain_file(ctx, ourCert)
|
2017-10-19 16:17:51 -07:00
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2012-10-29 15:39:42 -07:00
|
|
|
|
err_sys("can't load client cert file, check file and run from"
|
2015-01-05 14:48:43 -07:00
|
|
|
|
" wolfSSL home dir");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#else
|
|
|
|
|
|
load_buffer(ctx, ourCert, WOLFSSL_CERT_CHAIN);
|
|
|
|
|
|
#endif
|
2018-10-09 12:54:41 -07:00
|
|
|
|
}
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#ifdef HAVE_PK_CALLBACKS
|
|
|
|
|
|
pkCbInfo.ourKey = ourKey;
|
|
|
|
|
|
#endif
|
2018-10-19 14:52:18 +10:00
|
|
|
|
if (useClientCert && !loadCertKeyIntoSSLObj
|
2018-10-09 12:54:41 -07:00
|
|
|
|
#if defined(HAVE_PK_CALLBACKS) && defined(TEST_PK_PRIVKEY)
|
|
|
|
|
|
&& !pkCallbacks
|
|
|
|
|
|
#endif
|
|
|
|
|
|
) {
|
2020-10-09 09:45:00 -07:00
|
|
|
|
#ifdef NO_FILESYSTEM
|
2020-10-13 09:26:54 -06:00
|
|
|
|
if (wolfSSL_CTX_use_PrivateKey_buffer(ctx, client_key_der_2048,
|
|
|
|
|
|
sizeof_client_key_der_2048, SSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS)
|
2021-03-08 17:31:12 -06:00
|
|
|
|
err_sys("can't load client private key buffer");
|
2020-10-09 09:45:00 -07:00
|
|
|
|
#elif !defined(TEST_LOAD_BUFFER)
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_CTX_use_PrivateKey_file(ctx, ourKey, WOLFSSL_FILETYPE_PEM)
|
|
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2013-03-11 16:07:46 -07:00
|
|
|
|
err_sys("can't load client private key file, check file and run "
|
2015-01-05 14:48:43 -07:00
|
|
|
|
"from wolfSSL home dir");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#else
|
2016-11-23 17:19:54 -08:00
|
|
|
|
load_buffer(ctx, ourKey, WOLFSSL_KEY);
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#endif
|
2013-04-19 13:10:19 -07:00
|
|
|
|
}
|
2012-08-01 12:55:13 -07:00
|
|
|
|
|
2020-06-18 09:26:50 -07:00
|
|
|
|
if (!usePsk && !useAnon && !useVerifyCb && myVerifyAction != VERIFY_FORCE_FAIL) {
|
2021-02-15 15:47:03 +09:00
|
|
|
|
#if defined(OPENSSL_ALL) && defined(WOLFSSL_CERT_GEN) && \
|
2021-03-11 15:43:54 +09:00
|
|
|
|
(defined(WOLFSSL_CERT_REQ) || defined(WOLFSSL_CERT_EXT)) && \
|
2021-02-15 15:47:03 +09:00
|
|
|
|
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR)
|
|
|
|
|
|
if (useCertFolder) {
|
|
|
|
|
|
WOLFSSL_X509_STORE *store;
|
|
|
|
|
|
WOLFSSL_X509_LOOKUP *lookup;
|
2021-11-05 18:16:08 -05:00
|
|
|
|
|
2021-02-15 15:47:03 +09:00
|
|
|
|
store = wolfSSL_CTX_get_cert_store(ctx);
|
|
|
|
|
|
if (store == NULL) {
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
err_sys("can't get WOLFSSL_X509_STORE");
|
|
|
|
|
|
}
|
|
|
|
|
|
lookup = wolfSSL_X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
|
|
|
|
|
|
if (lookup == NULL) {
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
err_sys("can't add lookup");
|
|
|
|
|
|
}
|
|
|
|
|
|
if (wolfSSL_X509_LOOKUP_ctrl(lookup, WOLFSSL_X509_L_ADD_DIR, caCertFolder,
|
|
|
|
|
|
X509_FILETYPE_PEM, NULL) != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err_sys("X509_LOOKUP_ctrl w/ L_ADD_DIR failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
} else {
|
|
|
|
|
|
#endif
|
2020-10-09 09:45:00 -07:00
|
|
|
|
#ifdef NO_FILESYSTEM
|
|
|
|
|
|
if (wolfSSL_CTX_load_verify_buffer(ctx, ca_cert_der_2048,
|
|
|
|
|
|
sizeof_ca_cert_der_2048, SSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
err_sys("can't load ca buffer, Please run from wolfSSL home dir");
|
|
|
|
|
|
}
|
|
|
|
|
|
#elif !defined(TEST_LOAD_BUFFER)
|
2019-09-13 09:23:07 -07:00
|
|
|
|
unsigned int verify_flags = 0;
|
|
|
|
|
|
#ifdef TEST_BEFORE_DATE
|
|
|
|
|
|
verify_flags |= WOLFSSL_LOAD_FLAG_DATE_ERR_OKAY;
|
|
|
|
|
|
#endif
|
2021-11-30 10:44:05 -07:00
|
|
|
|
if (doPeerCheck != 0 &&
|
|
|
|
|
|
wolfSSL_CTX_load_verify_locations_ex(ctx, verifyCert, 0, verify_flags)
|
2017-10-19 16:17:51 -07:00
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2015-04-01 12:03:27 -07:00
|
|
|
|
err_sys("can't load ca file, Please run from wolfSSL home dir");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#else
|
2016-11-23 17:19:54 -08:00
|
|
|
|
load_buffer(ctx, verifyCert, WOLFSSL_CA);
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#endif /* !NO_FILESYSTEM */
|
2018-10-09 12:54:41 -07:00
|
|
|
|
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#ifdef HAVE_ECC
|
2015-04-01 12:03:27 -07:00
|
|
|
|
/* load ecc verify too, echoserver uses it by default w/ ecc */
|
2020-10-09 09:45:00 -07:00
|
|
|
|
#ifdef NO_FILESYSTEM
|
2021-11-30 10:44:05 -07:00
|
|
|
|
if (doPeerCheck != 0 &&
|
|
|
|
|
|
wolfSSL_CTX_load_verify_buffer(ctx, ca_ecc_cert_der_256,
|
2020-10-09 09:45:00 -07:00
|
|
|
|
sizeof_ca_ecc_cert_der_256, SSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
err_sys("can't load ecc ca buffer");
|
|
|
|
|
|
}
|
|
|
|
|
|
#elif !defined(TEST_LOAD_BUFFER)
|
2022-03-08 14:52:40 +01:00
|
|
|
|
if (doPeerCheck != 0 && !customVerifyCert &&
|
2021-11-30 10:44:05 -07:00
|
|
|
|
wolfSSL_CTX_load_verify_locations_ex(ctx, eccCertFile, 0, verify_flags)
|
2017-10-19 16:17:51 -07:00
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2015-04-01 12:03:27 -07:00
|
|
|
|
err_sys("can't load ecc ca file, Please run from wolfSSL home dir");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#else
|
2017-04-06 15:54:59 -07:00
|
|
|
|
load_buffer(ctx, eccCertFile, WOLFSSL_CA);
|
2018-10-09 12:54:41 -07:00
|
|
|
|
#endif /* !TEST_LOAD_BUFFER */
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#endif /* HAVE_ECC */
|
|
|
|
|
|
#if defined(WOLFSSL_TRUST_PEER_CERT) && !defined(NO_FILESYSTEM)
|
2016-03-01 16:35:32 -07:00
|
|
|
|
if (trustCert) {
|
2022-02-24 13:38:23 -08:00
|
|
|
|
if (wolfSSL_CTX_trust_peer_cert(ctx, trustCert,
|
|
|
|
|
|
WOLFSSL_FILETYPE_PEM) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-03-01 16:35:32 -07:00
|
|
|
|
err_sys("can't load trusted peer cert file");
|
|
|
|
|
|
}
|
2016-02-29 11:02:18 -07:00
|
|
|
|
}
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#endif /* WOLFSSL_TRUST_PEER_CERT && !NO_FILESYSTEM */
|
2021-02-15 15:47:03 +09:00
|
|
|
|
#if defined(OPENSSL_ALL) && defined(WOLFSSL_CERT_GEN) && \
|
2021-03-11 15:43:54 +09:00
|
|
|
|
(defined(WOLFSSL_CERT_REQ) || defined(WOLFSSL_CERT_EXT)) && \
|
2021-02-15 15:47:03 +09:00
|
|
|
|
!defined(NO_FILESYSTEM) && !defined(NO_WOLFSSL_DIR)
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2012-10-29 15:39:42 -07:00
|
|
|
|
}
|
2020-10-06 17:16:01 -07:00
|
|
|
|
if (useVerifyCb || myVerifyAction == VERIFY_FORCE_FAIL ||
|
2020-06-18 09:26:50 -07:00
|
|
|
|
myVerifyAction == VERIFY_USE_PREVERFIY) {
|
2017-10-11 09:09:52 -07:00
|
|
|
|
wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_PEER, myVerify);
|
2020-06-18 09:26:50 -07:00
|
|
|
|
}
|
|
|
|
|
|
else if (!usePsk && !useAnon && doPeerCheck == 0) {
|
2021-11-05 09:56:40 -07:00
|
|
|
|
wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_NONE, NULL);
|
2020-06-18 09:26:50 -07:00
|
|
|
|
}
|
|
|
|
|
|
else if (!usePsk && !useAnon && myVerifyAction == VERIFY_OVERRIDE_DATE_ERR) {
|
|
|
|
|
|
wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_PEER, myVerify);
|
|
|
|
|
|
}
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#endif /* !NO_CERTS */
|
2012-08-01 12:55:13 -07:00
|
|
|
|
|
2016-08-15 13:59:41 -06:00
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
ret = wolfAsync_DevOpen(&devId);
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
if (ret < 0) {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "Async device open failed\nRunning without async\n");
|
2016-08-15 13:59:41 -06:00
|
|
|
|
}
|
2021-06-08 12:15:42 -07:00
|
|
|
|
wolfSSL_CTX_SetDevId(ctx, devId);
|
2016-08-15 13:59:41 -06:00
|
|
|
|
#endif /* WOLFSSL_ASYNC_CRYPT */
|
2013-02-01 12:21:38 -08:00
|
|
|
|
|
2013-05-21 14:37:50 -07:00
|
|
|
|
#ifdef HAVE_SNI
|
2018-09-28 09:05:59 -07:00
|
|
|
|
if (sniHostName) {
|
2021-03-22 10:45:31 -07:00
|
|
|
|
if (wolfSSL_CTX_UseSNI(ctx, WOLFSSL_SNI_HOST_NAME, sniHostName,
|
2017-11-14 15:05:32 -07:00
|
|
|
|
(word16) XSTRLEN(sniHostName)) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2013-05-21 14:37:50 -07:00
|
|
|
|
err_sys("UseSNI failed");
|
2018-09-28 09:05:59 -07:00
|
|
|
|
}
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2013-05-21 14:37:50 -07:00
|
|
|
|
#endif
|
2013-07-23 15:42:43 -03:00
|
|
|
|
#ifdef HAVE_MAX_FRAGMENT
|
|
|
|
|
|
if (maxFragment)
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_CTX_UseMaxFragment(ctx, maxFragment) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2013-07-23 15:42:43 -03:00
|
|
|
|
err_sys("UseMaxFragment failed");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2013-07-23 15:42:43 -03:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_TRUNCATED_HMAC
|
|
|
|
|
|
if (truncatedHMAC)
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_CTX_UseTruncatedHMAC(ctx) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2013-07-23 15:42:43 -03:00
|
|
|
|
err_sys("UseTruncatedHMAC failed");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2013-07-23 15:42:43 -03:00
|
|
|
|
#endif
|
2014-09-30 09:24:42 -03:00
|
|
|
|
#ifdef HAVE_SESSION_TICKET
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_CTX_UseSessionTicket(ctx) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2014-09-30 09:24:42 -03:00
|
|
|
|
err_sys("UseSessionTicket failed");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2014-09-30 09:24:42 -03:00
|
|
|
|
#endif
|
2016-09-01 15:17:46 -06:00
|
|
|
|
#ifdef HAVE_EXTENDED_MASTER
|
2016-09-09 23:16:52 -07:00
|
|
|
|
if (disableExtMasterSecret)
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_CTX_DisableExtendedMasterSecret(ctx) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-09-09 23:16:52 -07:00
|
|
|
|
err_sys("DisableExtendedMasterSecret failed");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2016-09-01 15:17:46 -06:00
|
|
|
|
#endif
|
2018-09-21 09:27:48 -07:00
|
|
|
|
#if defined(HAVE_SUPPORTED_CURVES)
|
|
|
|
|
|
#if defined(HAVE_CURVE25519)
|
2017-05-22 09:09:31 +10:00
|
|
|
|
if (useX25519) {
|
|
|
|
|
|
if (wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_ECC_X25519)
|
2017-10-19 16:17:51 -07:00
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
2017-05-22 09:09:31 +10:00
|
|
|
|
err_sys("unable to support X25519");
|
|
|
|
|
|
}
|
2018-09-21 09:27:48 -07:00
|
|
|
|
}
|
|
|
|
|
|
#endif /* HAVE_CURVE25519 */
|
2020-02-19 18:07:45 +10:00
|
|
|
|
#if defined(HAVE_CURVE448)
|
|
|
|
|
|
if (useX448) {
|
|
|
|
|
|
if (wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_ECC_X448)
|
|
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err_sys("unable to support X448");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif /* HAVE_CURVE448 */
|
2018-09-21 09:27:48 -07:00
|
|
|
|
#ifdef HAVE_ECC
|
|
|
|
|
|
if (useSupCurve) {
|
|
|
|
|
|
#if !defined(NO_ECC_SECP) && \
|
|
|
|
|
|
(defined(HAVE_ECC384) || defined(HAVE_ALL_CURVES))
|
2018-04-13 11:53:42 +10:00
|
|
|
|
if (wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_ECC_SECP384R1)
|
|
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err_sys("unable to support secp384r1");
|
|
|
|
|
|
}
|
2018-09-21 09:27:48 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
#if !defined(NO_ECC_SECP) && \
|
|
|
|
|
|
(!defined(NO_ECC256) || defined(HAVE_ALL_CURVES))
|
|
|
|
|
|
if (wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_ECC_SECP256R1)
|
|
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err_sys("unable to support secp256r1");
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2017-05-22 09:09:31 +10:00
|
|
|
|
}
|
2018-09-21 09:27:48 -07:00
|
|
|
|
#endif /* HAVE_ECC */
|
2019-02-18 10:57:12 +10:00
|
|
|
|
#ifdef HAVE_FFDHE_2048
|
|
|
|
|
|
if (useSupCurve) {
|
|
|
|
|
|
if (wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_FFDHE_2048)
|
|
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err_sys("unable to support FFDHE 2048");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2018-09-21 09:27:48 -07:00
|
|
|
|
#endif /* HAVE_SUPPORTED_CURVES */
|
2013-05-21 14:37:50 -07:00
|
|
|
|
|
2018-04-09 13:53:05 +10:00
|
|
|
|
#ifdef WOLFSSL_TLS13
|
|
|
|
|
|
if (noPskDheKe)
|
|
|
|
|
|
wolfSSL_CTX_no_dhe_psk(ctx);
|
2023-01-24 12:00:37 +10:00
|
|
|
|
#ifdef HAVE_SUPPORTED_CURVES
|
|
|
|
|
|
if (onlyPskDheKe)
|
|
|
|
|
|
wolfSSL_CTX_only_dhe_psk(ctx);
|
|
|
|
|
|
#endif
|
2018-04-09 13:53:05 +10:00
|
|
|
|
#endif
|
|
|
|
|
|
#if defined(WOLFSSL_TLS13) && defined(WOLFSSL_POST_HANDSHAKE_AUTH)
|
|
|
|
|
|
if (postHandAuth)
|
|
|
|
|
|
wolfSSL_CTX_allow_post_handshake_auth(ctx);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2012-08-01 12:55:13 -07:00
|
|
|
|
if (benchmark) {
|
2015-10-14 19:13:45 -07:00
|
|
|
|
((func_args*)args)->return_code =
|
2016-08-25 22:20:35 -07:00
|
|
|
|
ClientBenchmarkConnections(ctx, host, port, dtlsUDP, dtlsSCTP,
|
2017-06-29 09:00:44 +10:00
|
|
|
|
benchmark, resumeSession, useX25519,
|
2021-12-20 11:26:25 -05:00
|
|
|
|
useX448, usePqc, pqcAlg, helloRetry,
|
2021-04-28 10:28:35 -07:00
|
|
|
|
onlyKeyShare, version, earlyData);
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2018-07-27 10:16:14 -07:00
|
|
|
|
XEXIT_T(EXIT_SUCCESS);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
}
|
2012-08-01 12:55:13 -07:00
|
|
|
|
|
2019-12-18 07:09:26 -08:00
|
|
|
|
if (throughput) {
|
2015-10-14 19:13:45 -07:00
|
|
|
|
((func_args*)args)->return_code =
|
2016-08-25 22:20:35 -07:00
|
|
|
|
ClientBenchmarkThroughput(ctx, host, port, dtlsUDP, dtlsSCTP,
|
2020-07-22 13:20:23 -07:00
|
|
|
|
block, throughput, useX25519, useX448,
|
2021-12-20 11:26:25 -05:00
|
|
|
|
usePqc, pqcAlg, exitWithRet, version,
|
2021-04-28 10:28:35 -07:00
|
|
|
|
onlyKeyShare);
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2021-10-28 14:46:15 +02:00
|
|
|
|
if (((func_args*)args)->return_code != EXIT_SUCCESS && !exitWithRet)
|
2020-07-22 13:20:23 -07:00
|
|
|
|
XEXIT_T(EXIT_SUCCESS);
|
|
|
|
|
|
else
|
|
|
|
|
|
goto exit;
|
2011-02-05 11:14:47 -08:00
|
|
|
|
}
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
2015-01-05 14:48:43 -07:00
|
|
|
|
#if defined(WOLFSSL_MDK_ARM)
|
2021-11-05 09:56:40 -07:00
|
|
|
|
wolfSSL_CTX_set_verify(ctx, WOLFSSL_VERIFY_NONE, NULL);
|
2013-05-19 10:02:13 +09:00
|
|
|
|
#endif
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
2016-12-08 19:05:35 -07:00
|
|
|
|
#if defined(OPENSSL_EXTRA)
|
|
|
|
|
|
if (wolfSSL_CTX_get_read_ahead(ctx) != 0) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-12-08 19:05:35 -07:00
|
|
|
|
err_sys("bad read ahead default value");
|
|
|
|
|
|
}
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_CTX_set_read_ahead(ctx, 1) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-12-09 13:16:17 -07:00
|
|
|
|
err_sys("error setting read ahead value");
|
|
|
|
|
|
}
|
2016-12-08 19:05:35 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2017-10-20 14:56:29 -07:00
|
|
|
|
#if defined(WOLFSSL_STATIC_MEMORY) && defined(DEBUG_WOLFSSL)
|
|
|
|
|
|
fprintf(stderr, "Before creating SSL\n");
|
|
|
|
|
|
if (wolfSSL_CTX_is_static_memory(ctx, &mem_stats) != 1)
|
|
|
|
|
|
err_sys("ctx not using static memory");
|
|
|
|
|
|
if (wolfSSL_PrintStats(&mem_stats) != 1) /* function in test.h */
|
|
|
|
|
|
err_sys("error printing out memory stats");
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2016-12-15 11:43:15 -08:00
|
|
|
|
if (doMcast) {
|
|
|
|
|
|
#ifdef WOLFSSL_MULTICAST
|
|
|
|
|
|
wolfSSL_CTX_mcast_set_member_id(ctx, mcastID);
|
2017-10-19 16:17:51 -07:00
|
|
|
|
if (wolfSSL_CTX_set_cipher_list(ctx, "WDM-NULL-SHA256")
|
|
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-12-15 11:43:15 -08:00
|
|
|
|
err_sys("Couldn't set multicast cipher list.");
|
2017-01-25 14:05:22 -08:00
|
|
|
|
}
|
2016-12-15 11:43:15 -08:00
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2018-03-21 11:27:08 -07:00
|
|
|
|
#ifdef HAVE_PK_CALLBACKS
|
|
|
|
|
|
if (pkCallbacks)
|
|
|
|
|
|
SetupPkCallbacks(ctx);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2015-01-05 14:48:43 -07:00
|
|
|
|
ssl = wolfSSL_new(ctx);
|
2017-01-10 09:26:47 +10:00
|
|
|
|
if (ssl == NULL) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2012-08-01 12:55:13 -07:00
|
|
|
|
err_sys("unable to get SSL object");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2016-01-29 09:38:13 -07:00
|
|
|
|
|
2021-04-15 15:24:13 +09:00
|
|
|
|
#ifndef NO_PSK
|
|
|
|
|
|
if (usePsk) {
|
|
|
|
|
|
#if defined(OPENSSL_EXTRA) && defined(WOLFSSL_TLS13) && defined(TEST_PSK_USE_SESSION)
|
|
|
|
|
|
SSL_set_psk_use_session_callback(ssl, my_psk_use_session_cb);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2018-10-09 12:54:41 -07:00
|
|
|
|
|
|
|
|
|
|
#ifndef NO_CERTS
|
|
|
|
|
|
if (useClientCert && loadCertKeyIntoSSLObj){
|
2020-10-09 09:45:00 -07:00
|
|
|
|
#ifdef NO_FILESYSTEM
|
|
|
|
|
|
if (wolfSSL_use_certificate_buffer(ssl, client_cert_der_2048,
|
|
|
|
|
|
sizeof_client_cert_der_2048, SSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
err_sys("can't load client cert buffer");
|
|
|
|
|
|
}
|
|
|
|
|
|
#elif !defined(TEST_LOAD_BUFFER)
|
2018-10-09 12:54:41 -07:00
|
|
|
|
if (wolfSSL_use_certificate_chain_file(ssl, ourCert)
|
|
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
err_sys("can't load client cert file, check file and run from"
|
|
|
|
|
|
" wolfSSL home dir");
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
load_ssl_buffer(ssl, ourCert, WOLFSSL_CERT_CHAIN);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (loadCertKeyIntoSSLObj
|
|
|
|
|
|
#if defined(HAVE_PK_CALLBACKS) && defined(TEST_PK_PRIVKEY)
|
|
|
|
|
|
&& !pkCallbacks
|
|
|
|
|
|
#endif
|
|
|
|
|
|
) {
|
2020-10-09 09:45:00 -07:00
|
|
|
|
#ifdef NO_FILESYSTEM
|
2020-10-13 09:26:54 -06:00
|
|
|
|
if (wolfSSL_CTX_use_PrivateKey_buffer(ctx, client_key_der_2048,
|
|
|
|
|
|
sizeof_client_key_der_2048, SSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS)
|
2020-10-09 09:45:00 -07:00
|
|
|
|
err_sys("can't load client private key buffer");
|
|
|
|
|
|
#elif !defined(TEST_LOAD_BUFFER)
|
2018-10-09 12:54:41 -07:00
|
|
|
|
if (wolfSSL_use_PrivateKey_file(ssl, ourKey, WOLFSSL_FILETYPE_PEM)
|
|
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
err_sys("can't load client private key file, check file and run "
|
|
|
|
|
|
"from wolfSSL home dir");
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
|
|
|
|
|
load_ssl_buffer(ssl, ourKey, WOLFSSL_KEY);
|
2016-11-07 10:15:04 -07:00
|
|
|
|
#endif
|
2018-10-09 12:54:41 -07:00
|
|
|
|
}
|
|
|
|
|
|
#endif /* !NO_CERTS */
|
|
|
|
|
|
|
2021-09-02 15:52:35 +02:00
|
|
|
|
#if defined(OPENSSL_EXTRA) || defined(HAVE_SECRET_CALLBACK)
|
2018-10-09 12:54:41 -07:00
|
|
|
|
wolfSSL_KeepArrays(ssl);
|
|
|
|
|
|
#endif
|
2016-11-07 10:15:04 -07:00
|
|
|
|
|
2021-08-16 13:09:17 -07:00
|
|
|
|
#ifdef HAVE_PK_CALLBACKS
|
|
|
|
|
|
/* This must be before SetKeyShare */
|
|
|
|
|
|
if (pkCallbacks) {
|
|
|
|
|
|
SetupPkCallbackContexts(ssl, &pkCbInfo);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2017-10-20 14:56:29 -07:00
|
|
|
|
#if defined(WOLFSSL_STATIC_MEMORY) && defined(DEBUG_WOLFSSL)
|
2018-10-09 12:54:41 -07:00
|
|
|
|
fprintf(stderr, "After creating SSL\n");
|
|
|
|
|
|
if (wolfSSL_CTX_is_static_memory(ctx, &mem_stats) != 1)
|
|
|
|
|
|
err_sys("ctx not using static memory");
|
|
|
|
|
|
if (wolfSSL_PrintStats(&mem_stats) != 1) /* function in test.h */
|
2017-10-20 14:56:29 -07:00
|
|
|
|
err_sys("error printing out memory stats");
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2020-10-28 11:47:31 +10:00
|
|
|
|
#if defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES)
|
2022-05-20 10:00:24 +02:00
|
|
|
|
if (!helloRetry && (version >= 4 || version <= -4)) {
|
2021-12-20 11:26:25 -05:00
|
|
|
|
SetKeyShare(ssl, onlyKeyShare, useX25519, useX448, usePqc,
|
|
|
|
|
|
pqcAlg, 0);
|
2016-11-24 01:31:07 +10:00
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
wolfSSL_NoKeyShares(ssl);
|
|
|
|
|
|
}
|
2018-10-09 12:54:41 -07:00
|
|
|
|
#endif
|
2016-01-29 09:38:13 -07:00
|
|
|
|
|
2016-12-15 11:43:15 -08:00
|
|
|
|
if (doMcast) {
|
|
|
|
|
|
#ifdef WOLFSSL_MULTICAST
|
2020-07-21 13:34:25 -07:00
|
|
|
|
/* DTLS multicast secret for testing only */
|
|
|
|
|
|
#define CLI_SRV_RANDOM_SZ 32 /* RAN_LEN (see internal.h) */
|
|
|
|
|
|
#define PMS_SZ 512 /* ENCRYPT_LEN (see internal.h) */
|
|
|
|
|
|
byte pms[PMS_SZ]; /* pre master secret */
|
|
|
|
|
|
byte cr[CLI_SRV_RANDOM_SZ]; /* client random */
|
|
|
|
|
|
byte sr[CLI_SRV_RANDOM_SZ]; /* server random */
|
|
|
|
|
|
const byte suite[2] = {0, 0xfe}; /* WDM_WITH_NULL_SHA256 */
|
2016-12-15 11:43:15 -08:00
|
|
|
|
|
|
|
|
|
|
XMEMSET(pms, 0x23, sizeof(pms));
|
|
|
|
|
|
XMEMSET(cr, 0xA5, sizeof(cr));
|
|
|
|
|
|
XMEMSET(sr, 0x5A, sizeof(sr));
|
|
|
|
|
|
|
|
|
|
|
|
if (wolfSSL_set_secret(ssl, 1, pms, sizeof(pms), cr, sr, suite)
|
2017-10-19 16:17:51 -07:00
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-12-15 11:43:15 -08:00
|
|
|
|
err_sys("unable to set mcast secret");
|
2017-01-25 14:05:22 -08:00
|
|
|
|
}
|
2016-12-15 11:43:15 -08:00
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2014-10-20 09:25:14 -07:00
|
|
|
|
#ifdef HAVE_SESSION_TICKET
|
2015-01-05 14:48:43 -07:00
|
|
|
|
wolfSSL_set_SessionTicket_cb(ssl, sessionTicketCB, (void*)"initial session");
|
2014-10-20 09:25:14 -07:00
|
|
|
|
#endif
|
2015-10-13 15:00:53 -07:00
|
|
|
|
|
2018-09-28 09:05:59 -07:00
|
|
|
|
#ifdef HAVE_TRUSTED_CA
|
|
|
|
|
|
if (trustedCaKeyId) {
|
|
|
|
|
|
if (wolfSSL_UseTrustedCA(ssl, WOLFSSL_TRUSTED_CA_PRE_AGREED,
|
|
|
|
|
|
NULL, 0) != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err_sys("UseTrustedCA failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2015-10-13 15:00:53 -07:00
|
|
|
|
#ifdef HAVE_ALPN
|
|
|
|
|
|
if (alpnList != NULL) {
|
|
|
|
|
|
printf("ALPN accepted protocols list : %s\n", alpnList);
|
|
|
|
|
|
wolfSSL_UseALPN(ssl, alpnList, (word32)XSTRLEN(alpnList), alpn_opt);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2018-08-02 16:25:38 -07:00
|
|
|
|
|
|
|
|
|
|
#if defined(HAVE_CERTIFICATE_STATUS_REQUEST) || \
|
|
|
|
|
|
defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2)
|
2015-11-02 15:51:01 -03:00
|
|
|
|
if (statusRequest) {
|
2018-08-02 16:25:38 -07:00
|
|
|
|
if (version == 4 &&
|
|
|
|
|
|
(statusRequest == OCSP_STAPLINGV2 || \
|
|
|
|
|
|
statusRequest == OCSP_STAPLINGV2_MULTI)) {
|
|
|
|
|
|
err_sys("Cannot use OCSP Stapling V2 with TLSv1.3");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2017-12-26 22:30:22 -03:00
|
|
|
|
if (wolfSSL_CTX_EnableOCSPStapling(ctx) != WOLFSSL_SUCCESS)
|
|
|
|
|
|
err_sys("can't enable OCSP Stapling Certificate Manager");
|
2020-10-15 17:27:58 +10:00
|
|
|
|
if (mustStaple) {
|
|
|
|
|
|
if (wolfSSL_CTX_EnableOCSPMustStaple(ctx) != WOLFSSL_SUCCESS)
|
|
|
|
|
|
err_sys("can't enable OCSP Must Staple");
|
|
|
|
|
|
}
|
2017-12-26 22:30:22 -03:00
|
|
|
|
|
2015-12-28 19:38:04 -03:00
|
|
|
|
switch (statusRequest) {
|
2018-08-02 16:25:38 -07:00
|
|
|
|
#ifdef HAVE_CERTIFICATE_STATUS_REQUEST
|
|
|
|
|
|
case OCSP_STAPLING:
|
2015-12-28 19:38:04 -03:00
|
|
|
|
if (wolfSSL_UseOCSPStapling(ssl, WOLFSSL_CSR_OCSP,
|
2017-10-19 16:17:51 -07:00
|
|
|
|
WOLFSSL_CSR_OCSP_USE_NONCE) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2015-12-28 19:38:04 -03:00
|
|
|
|
err_sys("UseCertificateStatusRequest failed");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2015-12-28 19:38:04 -03:00
|
|
|
|
break;
|
2018-08-02 16:25:38 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_CERTIFICATE_STATUS_REQUEST_V2
|
|
|
|
|
|
case OCSP_STAPLINGV2:
|
2015-12-28 19:38:04 -03:00
|
|
|
|
if (wolfSSL_UseOCSPStaplingV2(ssl,
|
|
|
|
|
|
WOLFSSL_CSR2_OCSP, WOLFSSL_CSR2_OCSP_USE_NONCE)
|
2017-10-19 16:17:51 -07:00
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2015-12-28 19:38:04 -03:00
|
|
|
|
err_sys("UseCertificateStatusRequest failed");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2015-12-28 19:38:04 -03:00
|
|
|
|
break;
|
2018-08-02 16:25:38 -07:00
|
|
|
|
case OCSP_STAPLINGV2_MULTI:
|
2015-12-28 19:38:04 -03:00
|
|
|
|
if (wolfSSL_UseOCSPStaplingV2(ssl,
|
|
|
|
|
|
WOLFSSL_CSR2_OCSP_MULTI, 0)
|
2017-10-19 16:17:51 -07:00
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2015-12-28 19:38:04 -03:00
|
|
|
|
err_sys("UseCertificateStatusRequest failed");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2015-12-28 19:38:04 -03:00
|
|
|
|
break;
|
2018-08-02 16:25:38 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
default:
|
|
|
|
|
|
err_sys("Invalid OCSP Stapling option");
|
2015-12-28 19:38:04 -03:00
|
|
|
|
}
|
2015-11-02 15:51:01 -03:00
|
|
|
|
|
2015-11-05 11:36:11 -03:00
|
|
|
|
wolfSSL_CTX_EnableOCSP(ctx, 0);
|
2015-11-02 15:51:01 -03:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2015-10-13 15:00:53 -07:00
|
|
|
|
|
2018-12-03 13:53:44 -08:00
|
|
|
|
#if !defined(NO_DH) && !defined(WOLFSSL_OLD_PRIME_CHECK) && \
|
|
|
|
|
|
!defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
|
|
|
|
|
|
if (!doDhKeyCheck)
|
|
|
|
|
|
wolfSSL_SetEnableDhKeyTest(ssl, 0);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2019-08-22 09:33:38 +10:00
|
|
|
|
#ifdef HAVE_ENCRYPT_THEN_MAC
|
|
|
|
|
|
if (disallowETM)
|
|
|
|
|
|
wolfSSL_AllowEncryptThenMac(ssl, 0);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2018-12-03 13:53:44 -08:00
|
|
|
|
|
2016-08-25 22:20:35 -07:00
|
|
|
|
tcp_connect(&sockfd, host, port, dtlsUDP, dtlsSCTP, ssl);
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_set_fd(ssl, sockfd) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-03-25 13:59:04 -06:00
|
|
|
|
err_sys("error in setting fd");
|
|
|
|
|
|
}
|
2016-04-22 13:46:54 -06:00
|
|
|
|
|
2022-04-26 15:51:50 +02:00
|
|
|
|
if (simulateWantWrite) {
|
2022-05-12 16:48:04 +02:00
|
|
|
|
if (dtlsUDP) {
|
|
|
|
|
|
wolfSSL_SetIOWriteCtx(ssl, (void*)&sockfd);
|
|
|
|
|
|
udp_connect(&sockfd, host, port);
|
|
|
|
|
|
}
|
2022-04-26 15:51:50 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
2016-04-22 13:46:54 -06:00
|
|
|
|
/* STARTTLS */
|
|
|
|
|
|
if (doSTARTTLS) {
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (StartTLS_Init(&sockfd) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-04-28 14:21:33 -06:00
|
|
|
|
err_sys("error during STARTTLS protocol");
|
2016-04-22 13:46:54 -06:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2023-01-03 10:48:00 -08:00
|
|
|
|
#if defined(HAVE_CRL) && !defined(NO_FILESYSTEM)
|
2017-06-16 16:02:36 -07:00
|
|
|
|
if (disableCRL == 0 && !useVerifyCb) {
|
2021-05-06 11:07:05 -07:00
|
|
|
|
#if defined(HAVE_IO_TIMEOUT) && defined(HAVE_HTTP_CLIENT)
|
2017-03-06 09:49:05 -08:00
|
|
|
|
wolfIO_SetTimeout(DEFAULT_TIMEOUT_SEC);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_EnableCRL(ssl, WOLFSSL_CRL_CHECKALL) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2015-05-07 10:02:43 -07:00
|
|
|
|
err_sys("can't enable crl check");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_LoadCRL(ssl, crlPemDir, WOLFSSL_FILETYPE_PEM, 0)
|
2017-10-19 16:17:51 -07:00
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2015-05-07 10:02:43 -07:00
|
|
|
|
err_sys("can't load crl, check crlfile and date validity");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_SetCRL_Cb(ssl, CRL_CallBack) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2015-05-07 10:02:43 -07:00
|
|
|
|
err_sys("can't set crl callback");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2015-05-07 10:02:43 -07:00
|
|
|
|
}
|
2013-08-09 17:27:15 -07:00
|
|
|
|
#endif
|
2014-09-24 18:48:23 -07:00
|
|
|
|
#ifdef HAVE_SECURE_RENEGOTIATION
|
|
|
|
|
|
if (scr) {
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_UseSecureRenegotiation(ssl) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2014-09-24 18:48:23 -07:00
|
|
|
|
err_sys("can't enable secure renegotiation");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2014-09-24 18:48:23 -07:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2019-08-22 09:33:38 +10:00
|
|
|
|
#if defined(ATOMIC_USER) && !defined(WOLFSSL_AEAD_ONLY)
|
2013-08-09 17:27:15 -07:00
|
|
|
|
if (atomicUser)
|
|
|
|
|
|
SetupAtomicUser(ctx, ssl);
|
2013-08-22 18:19:39 -07:00
|
|
|
|
#endif
|
2021-08-16 13:09:17 -07:00
|
|
|
|
|
2022-08-10 16:41:42 +02:00
|
|
|
|
#ifdef WOLFSSL_DTLS_CID
|
|
|
|
|
|
if (useDtlsCID) {
|
|
|
|
|
|
ret = wolfSSL_dtls_cid_use(ssl);
|
|
|
|
|
|
if (ret != WOLFSSL_SUCCESS)
|
|
|
|
|
|
err_sys("Can't enable DTLS ConnectionID");
|
2022-08-24 16:02:05 -07:00
|
|
|
|
ret = wolfSSL_dtls_cid_set(ssl, (unsigned char*)dtlsCID,
|
|
|
|
|
|
(word32)XSTRLEN(dtlsCID));
|
2022-08-10 16:41:42 +02:00
|
|
|
|
if (ret != WOLFSSL_SUCCESS)
|
|
|
|
|
|
err_sys("Can't set DTLS ConnectionID");
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif /* WOLFSSL_DTLS_CID */
|
|
|
|
|
|
|
2012-08-10 10:15:37 -07:00
|
|
|
|
if (matchName && doPeerCheck)
|
2015-01-05 14:48:43 -07:00
|
|
|
|
wolfSSL_check_domain_name(ssl, domain);
|
|
|
|
|
|
#ifndef WOLFSSL_CALLBACKS
|
2012-10-17 13:13:58 -07:00
|
|
|
|
if (nonBlocking) {
|
2018-05-23 16:07:45 -07:00
|
|
|
|
#ifdef WOLFSSL_DTLS
|
|
|
|
|
|
if (doDTLS) {
|
|
|
|
|
|
wolfSSL_dtls_set_using_nonblock(ssl, 1);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2012-10-17 13:13:58 -07:00
|
|
|
|
tcp_set_nonblocking(&sockfd);
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
ret = NonBlockingSSL_Connect(ssl);
|
2012-10-17 13:13:58 -07:00
|
|
|
|
}
|
2016-03-04 10:05:22 -08:00
|
|
|
|
else {
|
2018-08-28 15:37:15 +10:00
|
|
|
|
#ifdef WOLFSSL_EARLY_DATA
|
2018-10-24 09:47:30 +10:00
|
|
|
|
if (usePsk && earlyData)
|
2020-07-21 13:34:25 -07:00
|
|
|
|
EarlyData(ctx, ssl, kEarlyMsg, sizeof(kEarlyMsg)-1, buffer);
|
2018-08-28 15:37:15 +10:00
|
|
|
|
#endif
|
2016-03-04 10:05:22 -08:00
|
|
|
|
do {
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
err = 0; /* reset error */
|
2016-03-04 10:05:22 -08:00
|
|
|
|
ret = wolfSSL_connect(ssl);
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (ret != WOLFSSL_SUCCESS) {
|
2016-03-04 10:05:22 -08:00
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2016-03-04 10:05:22 -08:00
|
|
|
|
}
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
} while (err == WC_PENDING_E);
|
2012-10-17 13:13:58 -07:00
|
|
|
|
}
|
2011-02-05 11:14:47 -08:00
|
|
|
|
#else
|
2020-04-08 09:46:22 +10:00
|
|
|
|
timeoutConnect.tv_sec = DEFAULT_TIMEOUT_SEC;
|
|
|
|
|
|
timeoutConnect.tv_usec = 0;
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
ret = NonBlockingSSL_Connect(ssl); /* will keep retrying on timeout */
|
2011-02-05 11:14:47 -08:00
|
|
|
|
#endif
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (ret != WOLFSSL_SUCCESS) {
|
2018-05-03 10:02:59 -07:00
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "wolfSSL_connect error %d, %s\n", err,
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
wolfSSL_ERR_error_string(err, buffer));
|
2018-05-03 10:02:59 -07:00
|
|
|
|
|
|
|
|
|
|
/* cleanup */
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2018-05-03 09:40:51 -07:00
|
|
|
|
CloseSocket(sockfd);
|
|
|
|
|
|
|
2018-05-03 10:02:59 -07:00
|
|
|
|
if (!exitWithRet)
|
2018-05-03 09:40:51 -07:00
|
|
|
|
err_sys("wolfSSL_connect failed");
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
/* see note at top of README */
|
|
|
|
|
|
/* if you're getting an error here */
|
2018-05-03 09:40:51 -07:00
|
|
|
|
|
|
|
|
|
|
((func_args*)args)->return_code = err;
|
2018-05-03 13:39:37 -07:00
|
|
|
|
goto exit;
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
2018-10-20 13:40:01 +09:00
|
|
|
|
showPeerEx(ssl, lng_index);
|
2021-12-07 14:07:47 -07:00
|
|
|
|
showPeerPEM(ssl);
|
2012-08-20 17:02:25 -07:00
|
|
|
|
|
2020-11-11 22:46:02 -06:00
|
|
|
|
/* if the caller requested a particular cipher, check here that either
|
|
|
|
|
|
* a canonical name of the established cipher matches the requested
|
|
|
|
|
|
* cipher name, or the requested cipher name is marked as an alias
|
|
|
|
|
|
* that matches the established cipher.
|
|
|
|
|
|
*/
|
2021-03-01 16:39:17 +10:00
|
|
|
|
if (cipherList && !useDefCipherList && (! XSTRSTR(cipherList, ":"))) {
|
2020-11-11 22:46:02 -06:00
|
|
|
|
WOLFSSL_CIPHER* established_cipher = wolfSSL_get_current_cipher(ssl);
|
|
|
|
|
|
byte requested_cipherSuite0, requested_cipherSuite;
|
|
|
|
|
|
int requested_cipherFlags;
|
|
|
|
|
|
if (established_cipher &&
|
|
|
|
|
|
/* don't test for pseudo-ciphers like "ALL" and "DEFAULT". */
|
|
|
|
|
|
(wolfSSL_get_cipher_suite_from_name(cipherList,
|
|
|
|
|
|
&requested_cipherSuite0,
|
|
|
|
|
|
&requested_cipherSuite,
|
|
|
|
|
|
&requested_cipherFlags) == 0)) {
|
|
|
|
|
|
word32 established_cipher_id =
|
|
|
|
|
|
wolfSSL_CIPHER_get_id(established_cipher);
|
|
|
|
|
|
byte established_cipherSuite0 = (established_cipher_id >> 8) & 0xff;
|
|
|
|
|
|
byte established_cipherSuite = established_cipher_id & 0xff;
|
|
|
|
|
|
const char *established_cipher_name =
|
|
|
|
|
|
wolfSSL_get_cipher_name_from_suite(established_cipherSuite0,
|
|
|
|
|
|
established_cipherSuite);
|
|
|
|
|
|
const char *established_cipher_name_iana =
|
|
|
|
|
|
wolfSSL_get_cipher_name_iana_from_suite(established_cipherSuite0,
|
|
|
|
|
|
established_cipherSuite);
|
|
|
|
|
|
|
|
|
|
|
|
if (established_cipher_name == NULL)
|
|
|
|
|
|
err_sys("error looking up name of established cipher");
|
|
|
|
|
|
|
|
|
|
|
|
if (strcmp(cipherList, established_cipher_name) &&
|
|
|
|
|
|
((established_cipher_name_iana == NULL) ||
|
|
|
|
|
|
strcmp(cipherList, established_cipher_name_iana))) {
|
|
|
|
|
|
if (! (requested_cipherFlags & WOLFSSL_CIPHER_SUITE_FLAG_NAMEALIAS))
|
|
|
|
|
|
err_sys("Unexpected mismatch between names of requested and established ciphers.");
|
|
|
|
|
|
else if ((requested_cipherSuite0 != established_cipherSuite0) ||
|
|
|
|
|
|
(requested_cipherSuite != established_cipherSuite))
|
|
|
|
|
|
err_sys("Mismatch between IDs of requested and established ciphers.");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-10-08 23:26:28 -05:00
|
|
|
|
#if defined(HAVE_OCSP) && !defined(NO_ASN_TIME)
|
|
|
|
|
|
#ifdef HAVE_STRFTIME
|
2020-10-06 16:16:03 -05:00
|
|
|
|
{
|
|
|
|
|
|
struct tm tm;
|
|
|
|
|
|
char date[32];
|
2020-10-06 23:51:06 -05:00
|
|
|
|
ret = wolfSSL_get_ocsp_producedDate_tm(ssl, &tm);
|
2020-10-08 23:26:28 -05:00
|
|
|
|
if ((ret == 0) && (strftime(date, sizeof date, "%Y-%m-%d %H:%M:%S %z", &tm) > 0))
|
|
|
|
|
|
printf("OCSP response timestamp: %s\n", date);
|
2020-10-06 16:16:03 -05:00
|
|
|
|
}
|
2020-10-08 23:26:28 -05:00
|
|
|
|
#else
|
|
|
|
|
|
{
|
|
|
|
|
|
byte date[MAX_DATE_SIZE];
|
|
|
|
|
|
int asn_date_format;
|
|
|
|
|
|
ret = wolfSSL_get_ocsp_producedDate(ssl, date, sizeof date, &asn_date_format);
|
|
|
|
|
|
if (ret == 0)
|
|
|
|
|
|
printf("OCSP response timestamp: %s (ASN.1 type %d)\n", (char *)date, asn_date_format);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2020-10-06 16:16:03 -05:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2021-03-26 13:23:00 -07:00
|
|
|
|
#if defined(OPENSSL_EXTRA) || defined(HAVE_SECRET_CALLBACK)
|
2019-04-18 10:41:51 -06:00
|
|
|
|
printf("Session timeout set to %ld seconds\n", wolfSSL_get_timeout(ssl));
|
2016-11-07 10:15:04 -07:00
|
|
|
|
{
|
2016-11-11 13:39:36 -07:00
|
|
|
|
byte* rnd;
|
|
|
|
|
|
byte* pt;
|
|
|
|
|
|
size_t size;
|
2016-11-07 10:15:04 -07:00
|
|
|
|
|
|
|
|
|
|
/* get size of buffer then print */
|
|
|
|
|
|
size = wolfSSL_get_client_random(NULL, NULL, 0);
|
2016-11-11 13:39:36 -07:00
|
|
|
|
if (size == 0) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-11-07 10:15:04 -07:00
|
|
|
|
err_sys("error getting client random buffer size");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
rnd = (byte*)XMALLOC(size, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
|
|
|
if (rnd == NULL) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-11-07 10:15:04 -07:00
|
|
|
|
err_sys("error creating client random buffer");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
size = wolfSSL_get_client_random(ssl, rnd, size);
|
2016-11-11 13:39:36 -07:00
|
|
|
|
if (size == 0) {
|
2016-11-07 10:15:04 -07:00
|
|
|
|
XFREE(rnd, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-11-07 10:15:04 -07:00
|
|
|
|
err_sys("error getting client random buffer");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
printf("Client Random : ");
|
|
|
|
|
|
for (pt = rnd; pt < rnd + size; pt++) printf("%02X", *pt);
|
|
|
|
|
|
printf("\n");
|
|
|
|
|
|
XFREE(rnd, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
Add Apache HTTP Server compatibility and --enable-apachehttpd option (#2466)
* Added Apache httpd support `--enable-apachehttpd`.
* Added `SSL_CIPHER_get_version`, `BIO_new_fp`, `SSL_SESSION_print` and `SSL_in_connect_init` compatibility API's.
* Fix to expose `ASN1_UTCTIME_print` stub.
* Pulled in `wolfSSL_X509_get_ext_count` from QT.
* Added `X509_get_ext_count`, `BIO_set_callback`, `BIO_set_callback_arg` and `BIO_get_callback_arg`.
* Added `wolfSSL_ERR_print_errors`.
* Added `BIO_set_nbio` template.
* Fixes for building with Apache httpd.
* Added DH prime functions required for Apache httpd.
* Fix and move the BN DH prime macros.
* Fix for `SSL_CTX_set_tlsext_servername_arg` to have return code.
* Only add the `BN_get_rfc*_prime_*` macro's if older than 1.1.0.
* Added `ERR_GET_FUNC`, `SSL_CTX_clear_extra_chain_certs` prototypes.
* Added `wolfSSL_CTX_set_client_cert_cb` template and `OPENSSL_load_builtin_modules` stub macro.
* Added `X509_INFO` templates (`X509_INFO_new`, `X509_INFO_free`, `sk_X509_INFO_new_null`, `sk_X509_INFO_num`, `sk_X509_INFO_value`, `sk_X509_INFO_free`). Added `sk_X509_shift`.
* Added BIO_set_callback, BIO_get_callback, BIO_set_callback_arg, BIO_get_callback_arg
* add BIO_set_nbio, ERR_print_errors and tests
* add X509 INFO stack push function
* Add ASN1_UTCTIME_print and unit test
* Add X509_get_ext_count unit test
* initial commit of wolfSSL_PEM_X509_INFO_read_bio
* Added `sk_X509_NAME_new`, `sk_X509_NAME_push`, `sk_X509_NAME_find`, `sk_X509_NAME_set_cmp_func` and `sk_X509_NAME_free`. Grouped `sk_X509_NAME_*` functions.
* Cleanup sk X509 NAME/INFO pop free template.
* Advance openssl compatibility to v1.1.0 for Apache httpd. Added TLS version macros. Implemented sk X509 NAME/INFO pop and pop_free.
* Added `TLS_client_method` support.
* Added `SSL_get_server_tmp_key` and `EC_curve_nid2nist`.
* Added `SSL_CTX_set_min_proto_version` and `SSL_CTX_set_max_proto_version`. Fix for `BN_get_rfc*_prime_*` with the v1.1.0 change.
* add test cases for PEM_X509_INFO_read_bio
* Fixes for `BN_get_rfc*_prime_*` macros. Added template for `SSL_DH_set0_pqg`. Fix for `SSL_OP_NO_` to use Macro's (as is done in openssl). Added `SSL_set_verify_result`. Added stub for `OPENSSL_malloc_init`.
* Apache httpd compatibility functions. BIO setter/getters.
* implement ASN1_TIME_check and add test case
* add SSL_get_client_CA_list
* add initial implementation of wolfSSL_DH_set0_pqg
* Add apache support to OBJ_txt2nid and unit test, add stub for OBJ_create
* add X509_STORE_CTX_get1_chain, sk_free, sk_X509_dup
* Add sk_SSL_COMP_num and SSL_COMP struct
* implement and test of SSL_SESSION_print
* add SSL_CTX_set_client_cert_cb
* expand BIO_printf and add test case
* Added `OCSP_CERTID_dup`. Added `ASN1_TYPE`.
* add implementation for wolfSSL_get_server_tmp_key
* add wolfSSL_BIO_puts and test case
* Add X509_EXTENSION_get_object and X509_EXTENSION_get_data
* add helper for bio flag set and null x509 stack
* add test adn implementation for wolfSSL_i2d_PrivateKey
* Added `ASN1_OTHERNAME`, `ACCESS_DESCRIPTION` and `GENERAL_NAME`. Added `sk_ACCESS_DESCRIPTION_pop_free` and `ACCESS_DESCRIPTION_free` stubs.
* add wolfSSL_PEM_read_bio_ECPKParameters
* add BIO_vfree
* add X509_up_ref
* add X509_STORE_CTX_set_ex_data
* add _GNU_SOURCE macro and wolfSSL_EVP_read_pw_string
* add wolfSSL_EVP_PKEY_ref_up function
* X509_get_ext, X509V3_EXT_print, and d2i_DISPLAYTEXT stubs
* add X509_set_issuer_name
* add wolfSSL_sk_SSL_CIPHER_* functions and tests
* add prototype for sk_X509_EXTENSION and ACCESS_DESCRIPTION
* fix casting to avoid clang warning
* adjust test_wolfSSL_X509_STORE_CTX test case
* Added `OpenSSL_version`
* renegotiate functions and additional stack functions
* add aditional stub functions
* Add Apache httpd requirements for ALPN, CRL, Cert Gen/Req/Ext and SecRen. Fix for `sk_X509_INFO_new_null`.
* add ocsp stub functions
* Proper fix for `sk_X509_INFO_new_null`. Added templates for `X509_get_ext_by_NID` and `X509_add_ext`. Added templates for `ASN1_TIME_diff` and `ASN1_TIME_set`.
* x509 extension stack additions
* Fixed template for `OCSP_id_get0_info`.
* add X509 stub functions
* add X509_STORE_CTX_get0_store() and unit test
* Added `EVP_PKEY_CTX_new_id`, `EVP_PKEY_CTX_set_rsa_keygen_bits`, `EVP_PKEY_keygen_init`, `EVP_PKEY_keygen` and `BN_to_ASN1_INTEGER`.
* x509v3 stubs and req add extensions
* Add OBJ_txt2obj and unit test; add long name to wolfssl_object_info table for use by OBJ_* functions
* wolfSSL_set_alpn_protos implementation
* Added `EVP_SignInit_ex` and `TLS_server_method` implementation. Added stubs for `RSA_get0_key` and `i2d_OCSP_REQUEST_bio`. Fix typo on `OCSP_response_create`. Fix warning in `wolfSSL_set_alpn_protos`.
* Added `X509_EXTENSION_free` stub. Fixed a few macro typos/adding missing.
* add X509_STORE_CTX_get0_current_issuer and unit test
* add OBJ_cmp and unit test
* add RSA_get0_key and unit test
* add OCSP_check_nonce
* Implement X509_set_notAfter/notBefore/serialNumber/version,X509_STORE_CTX_set_depth,X509V3_set_ctx.
* Modify wolfSSL_X509_set_notAfter/notBefore and add tests for each.
* Add test_wolfSSL_X509_set_version w/ fixes to _set_version and fix _set_notBefore/notAfter tests
* add OCSP_id_get0_info and unit test, move WOLFSSL_ASN1_INTEGER to asn_public.h from ssl.h
* inital implementation of wolfSSL_X509_sign
* add debugging messages and set data for BIO's
* Add i2d_OCSP_REQUEST_bio.
* implementation of some WOLFSSL_BIO_METHOD custom functions
* fix for ASN time structure and remove log node
* initial eNULL support and sanity checks
* fixes after rebasing code
* adjust test cases and ASN1_TIME print
* Various fixes for memory leaks
* Apache compatibility in CTX_set_client_CA_list for X509_NAME use; add X509_NAME_dup as supporting function
* Add initial X509_STORE_load_locations stub for Apache
* Updates to X509_get_ext_d2i to return GENERAL_NAME struct instead of ASN1_OBJECT for alternative names and add supporting GENERAL_NAME functions
* Add X509_STORE_load_locations implementation; add wolfSSL_CertManagerLoadCRL_ex; initial renegotiation fixes/updates
* Fix for freeing peer cert in wolfSSL_Rehandshake instead of FreeHandShakeResources during secure renegotiation
* Add X509_ALGOR and X509_PUBKEY structs for X509_PUBKEY_get0_param and X509_get_X509_PUBKEY implementation
* Initial implementation of wolfSSL_X509_get_X509_PUBKEY and wolfSSL_X509_PUBKEY_get0_param
* Add implementation for X509_get0_tbs_sigalg and X509_ALGOR_get0
* Add OBJ_nid2ln implementation
* Fix compile errors in tests/api.c for some build options
* Updates to X509_STORE_load_locations for non-CRL types; Add additional DETECT_CERT_TYPE enum and logic for detecting certificate type in ProcessFile
* Add X509_STORE_load_locations unit test and minor error handling fixes
* Add unit test for X509_sign
* Set correct alert type for revoked certificates; add/fix a few WOLFSSL_ENTER messages
* Add X509_ALGOR member to X509 struct; refactoring and unit tests for wolfSSL_X509_ALGOR_get0 and wolfSSL_X509_get0_tbs_sigalg
* Add X509_PUBKEY member to X509 struct; refactoring and unit tests for wolfSSL_X509_get_X509_PUBKEY and wolfSSL_X509_PUBKEY_get0_param
* Stack fixes after rebase
* Secure renegotiation refactoring: add ACCEPT_BEGIN_RENEG to AcceptState for use in wolfSSL_SSL_in_connect_init; free old peer cert when receiving new cert to fix memory leak
* Move enc-then-mac enable option in configure.ac for apache httpd compatibility
* Simplify wolfSSL_SSL_in_connect_init logic
* Remove unneeded wolfSSL_CertManagerLoadCRL_ex
* Fixes for jenkins test failures
* SSL_get_secure_renegotiation_support for print statement in Apache
2019-09-19 18:11:10 -06:00
|
|
|
|
|
2016-11-07 10:15:04 -07:00
|
|
|
|
}
|
2021-03-26 13:23:00 -07:00
|
|
|
|
#endif
|
Add Apache HTTP Server compatibility and --enable-apachehttpd option (#2466)
* Added Apache httpd support `--enable-apachehttpd`.
* Added `SSL_CIPHER_get_version`, `BIO_new_fp`, `SSL_SESSION_print` and `SSL_in_connect_init` compatibility API's.
* Fix to expose `ASN1_UTCTIME_print` stub.
* Pulled in `wolfSSL_X509_get_ext_count` from QT.
* Added `X509_get_ext_count`, `BIO_set_callback`, `BIO_set_callback_arg` and `BIO_get_callback_arg`.
* Added `wolfSSL_ERR_print_errors`.
* Added `BIO_set_nbio` template.
* Fixes for building with Apache httpd.
* Added DH prime functions required for Apache httpd.
* Fix and move the BN DH prime macros.
* Fix for `SSL_CTX_set_tlsext_servername_arg` to have return code.
* Only add the `BN_get_rfc*_prime_*` macro's if older than 1.1.0.
* Added `ERR_GET_FUNC`, `SSL_CTX_clear_extra_chain_certs` prototypes.
* Added `wolfSSL_CTX_set_client_cert_cb` template and `OPENSSL_load_builtin_modules` stub macro.
* Added `X509_INFO` templates (`X509_INFO_new`, `X509_INFO_free`, `sk_X509_INFO_new_null`, `sk_X509_INFO_num`, `sk_X509_INFO_value`, `sk_X509_INFO_free`). Added `sk_X509_shift`.
* Added BIO_set_callback, BIO_get_callback, BIO_set_callback_arg, BIO_get_callback_arg
* add BIO_set_nbio, ERR_print_errors and tests
* add X509 INFO stack push function
* Add ASN1_UTCTIME_print and unit test
* Add X509_get_ext_count unit test
* initial commit of wolfSSL_PEM_X509_INFO_read_bio
* Added `sk_X509_NAME_new`, `sk_X509_NAME_push`, `sk_X509_NAME_find`, `sk_X509_NAME_set_cmp_func` and `sk_X509_NAME_free`. Grouped `sk_X509_NAME_*` functions.
* Cleanup sk X509 NAME/INFO pop free template.
* Advance openssl compatibility to v1.1.0 for Apache httpd. Added TLS version macros. Implemented sk X509 NAME/INFO pop and pop_free.
* Added `TLS_client_method` support.
* Added `SSL_get_server_tmp_key` and `EC_curve_nid2nist`.
* Added `SSL_CTX_set_min_proto_version` and `SSL_CTX_set_max_proto_version`. Fix for `BN_get_rfc*_prime_*` with the v1.1.0 change.
* add test cases for PEM_X509_INFO_read_bio
* Fixes for `BN_get_rfc*_prime_*` macros. Added template for `SSL_DH_set0_pqg`. Fix for `SSL_OP_NO_` to use Macro's (as is done in openssl). Added `SSL_set_verify_result`. Added stub for `OPENSSL_malloc_init`.
* Apache httpd compatibility functions. BIO setter/getters.
* implement ASN1_TIME_check and add test case
* add SSL_get_client_CA_list
* add initial implementation of wolfSSL_DH_set0_pqg
* Add apache support to OBJ_txt2nid and unit test, add stub for OBJ_create
* add X509_STORE_CTX_get1_chain, sk_free, sk_X509_dup
* Add sk_SSL_COMP_num and SSL_COMP struct
* implement and test of SSL_SESSION_print
* add SSL_CTX_set_client_cert_cb
* expand BIO_printf and add test case
* Added `OCSP_CERTID_dup`. Added `ASN1_TYPE`.
* add implementation for wolfSSL_get_server_tmp_key
* add wolfSSL_BIO_puts and test case
* Add X509_EXTENSION_get_object and X509_EXTENSION_get_data
* add helper for bio flag set and null x509 stack
* add test adn implementation for wolfSSL_i2d_PrivateKey
* Added `ASN1_OTHERNAME`, `ACCESS_DESCRIPTION` and `GENERAL_NAME`. Added `sk_ACCESS_DESCRIPTION_pop_free` and `ACCESS_DESCRIPTION_free` stubs.
* add wolfSSL_PEM_read_bio_ECPKParameters
* add BIO_vfree
* add X509_up_ref
* add X509_STORE_CTX_set_ex_data
* add _GNU_SOURCE macro and wolfSSL_EVP_read_pw_string
* add wolfSSL_EVP_PKEY_ref_up function
* X509_get_ext, X509V3_EXT_print, and d2i_DISPLAYTEXT stubs
* add X509_set_issuer_name
* add wolfSSL_sk_SSL_CIPHER_* functions and tests
* add prototype for sk_X509_EXTENSION and ACCESS_DESCRIPTION
* fix casting to avoid clang warning
* adjust test_wolfSSL_X509_STORE_CTX test case
* Added `OpenSSL_version`
* renegotiate functions and additional stack functions
* add aditional stub functions
* Add Apache httpd requirements for ALPN, CRL, Cert Gen/Req/Ext and SecRen. Fix for `sk_X509_INFO_new_null`.
* add ocsp stub functions
* Proper fix for `sk_X509_INFO_new_null`. Added templates for `X509_get_ext_by_NID` and `X509_add_ext`. Added templates for `ASN1_TIME_diff` and `ASN1_TIME_set`.
* x509 extension stack additions
* Fixed template for `OCSP_id_get0_info`.
* add X509 stub functions
* add X509_STORE_CTX_get0_store() and unit test
* Added `EVP_PKEY_CTX_new_id`, `EVP_PKEY_CTX_set_rsa_keygen_bits`, `EVP_PKEY_keygen_init`, `EVP_PKEY_keygen` and `BN_to_ASN1_INTEGER`.
* x509v3 stubs and req add extensions
* Add OBJ_txt2obj and unit test; add long name to wolfssl_object_info table for use by OBJ_* functions
* wolfSSL_set_alpn_protos implementation
* Added `EVP_SignInit_ex` and `TLS_server_method` implementation. Added stubs for `RSA_get0_key` and `i2d_OCSP_REQUEST_bio`. Fix typo on `OCSP_response_create`. Fix warning in `wolfSSL_set_alpn_protos`.
* Added `X509_EXTENSION_free` stub. Fixed a few macro typos/adding missing.
* add X509_STORE_CTX_get0_current_issuer and unit test
* add OBJ_cmp and unit test
* add RSA_get0_key and unit test
* add OCSP_check_nonce
* Implement X509_set_notAfter/notBefore/serialNumber/version,X509_STORE_CTX_set_depth,X509V3_set_ctx.
* Modify wolfSSL_X509_set_notAfter/notBefore and add tests for each.
* Add test_wolfSSL_X509_set_version w/ fixes to _set_version and fix _set_notBefore/notAfter tests
* add OCSP_id_get0_info and unit test, move WOLFSSL_ASN1_INTEGER to asn_public.h from ssl.h
* inital implementation of wolfSSL_X509_sign
* add debugging messages and set data for BIO's
* Add i2d_OCSP_REQUEST_bio.
* implementation of some WOLFSSL_BIO_METHOD custom functions
* fix for ASN time structure and remove log node
* initial eNULL support and sanity checks
* fixes after rebasing code
* adjust test cases and ASN1_TIME print
* Various fixes for memory leaks
* Apache compatibility in CTX_set_client_CA_list for X509_NAME use; add X509_NAME_dup as supporting function
* Add initial X509_STORE_load_locations stub for Apache
* Updates to X509_get_ext_d2i to return GENERAL_NAME struct instead of ASN1_OBJECT for alternative names and add supporting GENERAL_NAME functions
* Add X509_STORE_load_locations implementation; add wolfSSL_CertManagerLoadCRL_ex; initial renegotiation fixes/updates
* Fix for freeing peer cert in wolfSSL_Rehandshake instead of FreeHandShakeResources during secure renegotiation
* Add X509_ALGOR and X509_PUBKEY structs for X509_PUBKEY_get0_param and X509_get_X509_PUBKEY implementation
* Initial implementation of wolfSSL_X509_get_X509_PUBKEY and wolfSSL_X509_PUBKEY_get0_param
* Add implementation for X509_get0_tbs_sigalg and X509_ALGOR_get0
* Add OBJ_nid2ln implementation
* Fix compile errors in tests/api.c for some build options
* Updates to X509_STORE_load_locations for non-CRL types; Add additional DETECT_CERT_TYPE enum and logic for detecting certificate type in ProcessFile
* Add X509_STORE_load_locations unit test and minor error handling fixes
* Add unit test for X509_sign
* Set correct alert type for revoked certificates; add/fix a few WOLFSSL_ENTER messages
* Add X509_ALGOR member to X509 struct; refactoring and unit tests for wolfSSL_X509_ALGOR_get0 and wolfSSL_X509_get0_tbs_sigalg
* Add X509_PUBKEY member to X509 struct; refactoring and unit tests for wolfSSL_X509_get_X509_PUBKEY and wolfSSL_X509_PUBKEY_get0_param
* Stack fixes after rebase
* Secure renegotiation refactoring: add ACCEPT_BEGIN_RENEG to AcceptState for use in wolfSSL_SSL_in_connect_init; free old peer cert when receiving new cert to fix memory leak
* Move enc-then-mac enable option in configure.ac for apache httpd compatibility
* Simplify wolfSSL_SSL_in_connect_init logic
* Remove unneeded wolfSSL_CertManagerLoadCRL_ex
* Fixes for jenkins test failures
* SSL_get_secure_renegotiation_support for print statement in Apache
2019-09-19 18:11:10 -06:00
|
|
|
|
|
2021-03-26 13:41:11 -07:00
|
|
|
|
#if defined(OPENSSL_ALL) || (defined(OPENSSL_EXTRA) && (defined(HAVE_STUNNEL) || \
|
|
|
|
|
|
defined(WOLFSSL_NGINX) || defined(HAVE_LIGHTY) || \
|
|
|
|
|
|
defined(WOLFSSL_HAPROXY) || defined(WOLFSSL_OPENSSH)))
|
2021-03-26 15:39:55 -07:00
|
|
|
|
#if !defined(NO_SESSION_CACHE) && \
|
|
|
|
|
|
(defined(HAVE_SESSION_TICKET) || defined(SESSION_CERTS)) && \
|
|
|
|
|
|
!defined(NO_FILESYSTEM)
|
2020-11-03 15:26:50 -08:00
|
|
|
|
#ifndef NO_BIO
|
Add Apache HTTP Server compatibility and --enable-apachehttpd option (#2466)
* Added Apache httpd support `--enable-apachehttpd`.
* Added `SSL_CIPHER_get_version`, `BIO_new_fp`, `SSL_SESSION_print` and `SSL_in_connect_init` compatibility API's.
* Fix to expose `ASN1_UTCTIME_print` stub.
* Pulled in `wolfSSL_X509_get_ext_count` from QT.
* Added `X509_get_ext_count`, `BIO_set_callback`, `BIO_set_callback_arg` and `BIO_get_callback_arg`.
* Added `wolfSSL_ERR_print_errors`.
* Added `BIO_set_nbio` template.
* Fixes for building with Apache httpd.
* Added DH prime functions required for Apache httpd.
* Fix and move the BN DH prime macros.
* Fix for `SSL_CTX_set_tlsext_servername_arg` to have return code.
* Only add the `BN_get_rfc*_prime_*` macro's if older than 1.1.0.
* Added `ERR_GET_FUNC`, `SSL_CTX_clear_extra_chain_certs` prototypes.
* Added `wolfSSL_CTX_set_client_cert_cb` template and `OPENSSL_load_builtin_modules` stub macro.
* Added `X509_INFO` templates (`X509_INFO_new`, `X509_INFO_free`, `sk_X509_INFO_new_null`, `sk_X509_INFO_num`, `sk_X509_INFO_value`, `sk_X509_INFO_free`). Added `sk_X509_shift`.
* Added BIO_set_callback, BIO_get_callback, BIO_set_callback_arg, BIO_get_callback_arg
* add BIO_set_nbio, ERR_print_errors and tests
* add X509 INFO stack push function
* Add ASN1_UTCTIME_print and unit test
* Add X509_get_ext_count unit test
* initial commit of wolfSSL_PEM_X509_INFO_read_bio
* Added `sk_X509_NAME_new`, `sk_X509_NAME_push`, `sk_X509_NAME_find`, `sk_X509_NAME_set_cmp_func` and `sk_X509_NAME_free`. Grouped `sk_X509_NAME_*` functions.
* Cleanup sk X509 NAME/INFO pop free template.
* Advance openssl compatibility to v1.1.0 for Apache httpd. Added TLS version macros. Implemented sk X509 NAME/INFO pop and pop_free.
* Added `TLS_client_method` support.
* Added `SSL_get_server_tmp_key` and `EC_curve_nid2nist`.
* Added `SSL_CTX_set_min_proto_version` and `SSL_CTX_set_max_proto_version`. Fix for `BN_get_rfc*_prime_*` with the v1.1.0 change.
* add test cases for PEM_X509_INFO_read_bio
* Fixes for `BN_get_rfc*_prime_*` macros. Added template for `SSL_DH_set0_pqg`. Fix for `SSL_OP_NO_` to use Macro's (as is done in openssl). Added `SSL_set_verify_result`. Added stub for `OPENSSL_malloc_init`.
* Apache httpd compatibility functions. BIO setter/getters.
* implement ASN1_TIME_check and add test case
* add SSL_get_client_CA_list
* add initial implementation of wolfSSL_DH_set0_pqg
* Add apache support to OBJ_txt2nid and unit test, add stub for OBJ_create
* add X509_STORE_CTX_get1_chain, sk_free, sk_X509_dup
* Add sk_SSL_COMP_num and SSL_COMP struct
* implement and test of SSL_SESSION_print
* add SSL_CTX_set_client_cert_cb
* expand BIO_printf and add test case
* Added `OCSP_CERTID_dup`. Added `ASN1_TYPE`.
* add implementation for wolfSSL_get_server_tmp_key
* add wolfSSL_BIO_puts and test case
* Add X509_EXTENSION_get_object and X509_EXTENSION_get_data
* add helper for bio flag set and null x509 stack
* add test adn implementation for wolfSSL_i2d_PrivateKey
* Added `ASN1_OTHERNAME`, `ACCESS_DESCRIPTION` and `GENERAL_NAME`. Added `sk_ACCESS_DESCRIPTION_pop_free` and `ACCESS_DESCRIPTION_free` stubs.
* add wolfSSL_PEM_read_bio_ECPKParameters
* add BIO_vfree
* add X509_up_ref
* add X509_STORE_CTX_set_ex_data
* add _GNU_SOURCE macro and wolfSSL_EVP_read_pw_string
* add wolfSSL_EVP_PKEY_ref_up function
* X509_get_ext, X509V3_EXT_print, and d2i_DISPLAYTEXT stubs
* add X509_set_issuer_name
* add wolfSSL_sk_SSL_CIPHER_* functions and tests
* add prototype for sk_X509_EXTENSION and ACCESS_DESCRIPTION
* fix casting to avoid clang warning
* adjust test_wolfSSL_X509_STORE_CTX test case
* Added `OpenSSL_version`
* renegotiate functions and additional stack functions
* add aditional stub functions
* Add Apache httpd requirements for ALPN, CRL, Cert Gen/Req/Ext and SecRen. Fix for `sk_X509_INFO_new_null`.
* add ocsp stub functions
* Proper fix for `sk_X509_INFO_new_null`. Added templates for `X509_get_ext_by_NID` and `X509_add_ext`. Added templates for `ASN1_TIME_diff` and `ASN1_TIME_set`.
* x509 extension stack additions
* Fixed template for `OCSP_id_get0_info`.
* add X509 stub functions
* add X509_STORE_CTX_get0_store() and unit test
* Added `EVP_PKEY_CTX_new_id`, `EVP_PKEY_CTX_set_rsa_keygen_bits`, `EVP_PKEY_keygen_init`, `EVP_PKEY_keygen` and `BN_to_ASN1_INTEGER`.
* x509v3 stubs and req add extensions
* Add OBJ_txt2obj and unit test; add long name to wolfssl_object_info table for use by OBJ_* functions
* wolfSSL_set_alpn_protos implementation
* Added `EVP_SignInit_ex` and `TLS_server_method` implementation. Added stubs for `RSA_get0_key` and `i2d_OCSP_REQUEST_bio`. Fix typo on `OCSP_response_create`. Fix warning in `wolfSSL_set_alpn_protos`.
* Added `X509_EXTENSION_free` stub. Fixed a few macro typos/adding missing.
* add X509_STORE_CTX_get0_current_issuer and unit test
* add OBJ_cmp and unit test
* add RSA_get0_key and unit test
* add OCSP_check_nonce
* Implement X509_set_notAfter/notBefore/serialNumber/version,X509_STORE_CTX_set_depth,X509V3_set_ctx.
* Modify wolfSSL_X509_set_notAfter/notBefore and add tests for each.
* Add test_wolfSSL_X509_set_version w/ fixes to _set_version and fix _set_notBefore/notAfter tests
* add OCSP_id_get0_info and unit test, move WOLFSSL_ASN1_INTEGER to asn_public.h from ssl.h
* inital implementation of wolfSSL_X509_sign
* add debugging messages and set data for BIO's
* Add i2d_OCSP_REQUEST_bio.
* implementation of some WOLFSSL_BIO_METHOD custom functions
* fix for ASN time structure and remove log node
* initial eNULL support and sanity checks
* fixes after rebasing code
* adjust test cases and ASN1_TIME print
* Various fixes for memory leaks
* Apache compatibility in CTX_set_client_CA_list for X509_NAME use; add X509_NAME_dup as supporting function
* Add initial X509_STORE_load_locations stub for Apache
* Updates to X509_get_ext_d2i to return GENERAL_NAME struct instead of ASN1_OBJECT for alternative names and add supporting GENERAL_NAME functions
* Add X509_STORE_load_locations implementation; add wolfSSL_CertManagerLoadCRL_ex; initial renegotiation fixes/updates
* Fix for freeing peer cert in wolfSSL_Rehandshake instead of FreeHandShakeResources during secure renegotiation
* Add X509_ALGOR and X509_PUBKEY structs for X509_PUBKEY_get0_param and X509_get_X509_PUBKEY implementation
* Initial implementation of wolfSSL_X509_get_X509_PUBKEY and wolfSSL_X509_PUBKEY_get0_param
* Add implementation for X509_get0_tbs_sigalg and X509_ALGOR_get0
* Add OBJ_nid2ln implementation
* Fix compile errors in tests/api.c for some build options
* Updates to X509_STORE_load_locations for non-CRL types; Add additional DETECT_CERT_TYPE enum and logic for detecting certificate type in ProcessFile
* Add X509_STORE_load_locations unit test and minor error handling fixes
* Add unit test for X509_sign
* Set correct alert type for revoked certificates; add/fix a few WOLFSSL_ENTER messages
* Add X509_ALGOR member to X509 struct; refactoring and unit tests for wolfSSL_X509_ALGOR_get0 and wolfSSL_X509_get0_tbs_sigalg
* Add X509_PUBKEY member to X509 struct; refactoring and unit tests for wolfSSL_X509_get_X509_PUBKEY and wolfSSL_X509_PUBKEY_get0_param
* Stack fixes after rebase
* Secure renegotiation refactoring: add ACCEPT_BEGIN_RENEG to AcceptState for use in wolfSSL_SSL_in_connect_init; free old peer cert when receiving new cert to fix memory leak
* Move enc-then-mac enable option in configure.ac for apache httpd compatibility
* Simplify wolfSSL_SSL_in_connect_init logic
* Remove unneeded wolfSSL_CertManagerLoadCRL_ex
* Fixes for jenkins test failures
* SSL_get_secure_renegotiation_support for print statement in Apache
2019-09-19 18:11:10 -06:00
|
|
|
|
/* print out session to stdout */
|
|
|
|
|
|
{
|
|
|
|
|
|
WOLFSSL_BIO* bio = wolfSSL_BIO_new_fp(stdout, BIO_NOCLOSE);
|
|
|
|
|
|
if (bio != NULL) {
|
|
|
|
|
|
if (wolfSSL_SESSION_print(bio, wolfSSL_get_session(ssl)) !=
|
|
|
|
|
|
WOLFSSL_SUCCESS) {
|
2021-06-08 12:15:42 -07:00
|
|
|
|
wolfSSL_BIO_printf(bio, "BIO error printing session\n");
|
Add Apache HTTP Server compatibility and --enable-apachehttpd option (#2466)
* Added Apache httpd support `--enable-apachehttpd`.
* Added `SSL_CIPHER_get_version`, `BIO_new_fp`, `SSL_SESSION_print` and `SSL_in_connect_init` compatibility API's.
* Fix to expose `ASN1_UTCTIME_print` stub.
* Pulled in `wolfSSL_X509_get_ext_count` from QT.
* Added `X509_get_ext_count`, `BIO_set_callback`, `BIO_set_callback_arg` and `BIO_get_callback_arg`.
* Added `wolfSSL_ERR_print_errors`.
* Added `BIO_set_nbio` template.
* Fixes for building with Apache httpd.
* Added DH prime functions required for Apache httpd.
* Fix and move the BN DH prime macros.
* Fix for `SSL_CTX_set_tlsext_servername_arg` to have return code.
* Only add the `BN_get_rfc*_prime_*` macro's if older than 1.1.0.
* Added `ERR_GET_FUNC`, `SSL_CTX_clear_extra_chain_certs` prototypes.
* Added `wolfSSL_CTX_set_client_cert_cb` template and `OPENSSL_load_builtin_modules` stub macro.
* Added `X509_INFO` templates (`X509_INFO_new`, `X509_INFO_free`, `sk_X509_INFO_new_null`, `sk_X509_INFO_num`, `sk_X509_INFO_value`, `sk_X509_INFO_free`). Added `sk_X509_shift`.
* Added BIO_set_callback, BIO_get_callback, BIO_set_callback_arg, BIO_get_callback_arg
* add BIO_set_nbio, ERR_print_errors and tests
* add X509 INFO stack push function
* Add ASN1_UTCTIME_print and unit test
* Add X509_get_ext_count unit test
* initial commit of wolfSSL_PEM_X509_INFO_read_bio
* Added `sk_X509_NAME_new`, `sk_X509_NAME_push`, `sk_X509_NAME_find`, `sk_X509_NAME_set_cmp_func` and `sk_X509_NAME_free`. Grouped `sk_X509_NAME_*` functions.
* Cleanup sk X509 NAME/INFO pop free template.
* Advance openssl compatibility to v1.1.0 for Apache httpd. Added TLS version macros. Implemented sk X509 NAME/INFO pop and pop_free.
* Added `TLS_client_method` support.
* Added `SSL_get_server_tmp_key` and `EC_curve_nid2nist`.
* Added `SSL_CTX_set_min_proto_version` and `SSL_CTX_set_max_proto_version`. Fix for `BN_get_rfc*_prime_*` with the v1.1.0 change.
* add test cases for PEM_X509_INFO_read_bio
* Fixes for `BN_get_rfc*_prime_*` macros. Added template for `SSL_DH_set0_pqg`. Fix for `SSL_OP_NO_` to use Macro's (as is done in openssl). Added `SSL_set_verify_result`. Added stub for `OPENSSL_malloc_init`.
* Apache httpd compatibility functions. BIO setter/getters.
* implement ASN1_TIME_check and add test case
* add SSL_get_client_CA_list
* add initial implementation of wolfSSL_DH_set0_pqg
* Add apache support to OBJ_txt2nid and unit test, add stub for OBJ_create
* add X509_STORE_CTX_get1_chain, sk_free, sk_X509_dup
* Add sk_SSL_COMP_num and SSL_COMP struct
* implement and test of SSL_SESSION_print
* add SSL_CTX_set_client_cert_cb
* expand BIO_printf and add test case
* Added `OCSP_CERTID_dup`. Added `ASN1_TYPE`.
* add implementation for wolfSSL_get_server_tmp_key
* add wolfSSL_BIO_puts and test case
* Add X509_EXTENSION_get_object and X509_EXTENSION_get_data
* add helper for bio flag set and null x509 stack
* add test adn implementation for wolfSSL_i2d_PrivateKey
* Added `ASN1_OTHERNAME`, `ACCESS_DESCRIPTION` and `GENERAL_NAME`. Added `sk_ACCESS_DESCRIPTION_pop_free` and `ACCESS_DESCRIPTION_free` stubs.
* add wolfSSL_PEM_read_bio_ECPKParameters
* add BIO_vfree
* add X509_up_ref
* add X509_STORE_CTX_set_ex_data
* add _GNU_SOURCE macro and wolfSSL_EVP_read_pw_string
* add wolfSSL_EVP_PKEY_ref_up function
* X509_get_ext, X509V3_EXT_print, and d2i_DISPLAYTEXT stubs
* add X509_set_issuer_name
* add wolfSSL_sk_SSL_CIPHER_* functions and tests
* add prototype for sk_X509_EXTENSION and ACCESS_DESCRIPTION
* fix casting to avoid clang warning
* adjust test_wolfSSL_X509_STORE_CTX test case
* Added `OpenSSL_version`
* renegotiate functions and additional stack functions
* add aditional stub functions
* Add Apache httpd requirements for ALPN, CRL, Cert Gen/Req/Ext and SecRen. Fix for `sk_X509_INFO_new_null`.
* add ocsp stub functions
* Proper fix for `sk_X509_INFO_new_null`. Added templates for `X509_get_ext_by_NID` and `X509_add_ext`. Added templates for `ASN1_TIME_diff` and `ASN1_TIME_set`.
* x509 extension stack additions
* Fixed template for `OCSP_id_get0_info`.
* add X509 stub functions
* add X509_STORE_CTX_get0_store() and unit test
* Added `EVP_PKEY_CTX_new_id`, `EVP_PKEY_CTX_set_rsa_keygen_bits`, `EVP_PKEY_keygen_init`, `EVP_PKEY_keygen` and `BN_to_ASN1_INTEGER`.
* x509v3 stubs and req add extensions
* Add OBJ_txt2obj and unit test; add long name to wolfssl_object_info table for use by OBJ_* functions
* wolfSSL_set_alpn_protos implementation
* Added `EVP_SignInit_ex` and `TLS_server_method` implementation. Added stubs for `RSA_get0_key` and `i2d_OCSP_REQUEST_bio`. Fix typo on `OCSP_response_create`. Fix warning in `wolfSSL_set_alpn_protos`.
* Added `X509_EXTENSION_free` stub. Fixed a few macro typos/adding missing.
* add X509_STORE_CTX_get0_current_issuer and unit test
* add OBJ_cmp and unit test
* add RSA_get0_key and unit test
* add OCSP_check_nonce
* Implement X509_set_notAfter/notBefore/serialNumber/version,X509_STORE_CTX_set_depth,X509V3_set_ctx.
* Modify wolfSSL_X509_set_notAfter/notBefore and add tests for each.
* Add test_wolfSSL_X509_set_version w/ fixes to _set_version and fix _set_notBefore/notAfter tests
* add OCSP_id_get0_info and unit test, move WOLFSSL_ASN1_INTEGER to asn_public.h from ssl.h
* inital implementation of wolfSSL_X509_sign
* add debugging messages and set data for BIO's
* Add i2d_OCSP_REQUEST_bio.
* implementation of some WOLFSSL_BIO_METHOD custom functions
* fix for ASN time structure and remove log node
* initial eNULL support and sanity checks
* fixes after rebasing code
* adjust test cases and ASN1_TIME print
* Various fixes for memory leaks
* Apache compatibility in CTX_set_client_CA_list for X509_NAME use; add X509_NAME_dup as supporting function
* Add initial X509_STORE_load_locations stub for Apache
* Updates to X509_get_ext_d2i to return GENERAL_NAME struct instead of ASN1_OBJECT for alternative names and add supporting GENERAL_NAME functions
* Add X509_STORE_load_locations implementation; add wolfSSL_CertManagerLoadCRL_ex; initial renegotiation fixes/updates
* Fix for freeing peer cert in wolfSSL_Rehandshake instead of FreeHandShakeResources during secure renegotiation
* Add X509_ALGOR and X509_PUBKEY structs for X509_PUBKEY_get0_param and X509_get_X509_PUBKEY implementation
* Initial implementation of wolfSSL_X509_get_X509_PUBKEY and wolfSSL_X509_PUBKEY_get0_param
* Add implementation for X509_get0_tbs_sigalg and X509_ALGOR_get0
* Add OBJ_nid2ln implementation
* Fix compile errors in tests/api.c for some build options
* Updates to X509_STORE_load_locations for non-CRL types; Add additional DETECT_CERT_TYPE enum and logic for detecting certificate type in ProcessFile
* Add X509_STORE_load_locations unit test and minor error handling fixes
* Add unit test for X509_sign
* Set correct alert type for revoked certificates; add/fix a few WOLFSSL_ENTER messages
* Add X509_ALGOR member to X509 struct; refactoring and unit tests for wolfSSL_X509_ALGOR_get0 and wolfSSL_X509_get0_tbs_sigalg
* Add X509_PUBKEY member to X509 struct; refactoring and unit tests for wolfSSL_X509_get_X509_PUBKEY and wolfSSL_X509_PUBKEY_get0_param
* Stack fixes after rebase
* Secure renegotiation refactoring: add ACCEPT_BEGIN_RENEG to AcceptState for use in wolfSSL_SSL_in_connect_init; free old peer cert when receiving new cert to fix memory leak
* Move enc-then-mac enable option in configure.ac for apache httpd compatibility
* Simplify wolfSSL_SSL_in_connect_init logic
* Remove unneeded wolfSSL_CertManagerLoadCRL_ex
* Fixes for jenkins test failures
* SSL_get_secure_renegotiation_support for print statement in Apache
2019-09-19 18:11:10 -06:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
wolfSSL_BIO_free(bio);
|
|
|
|
|
|
}
|
2021-03-26 13:23:00 -07:00
|
|
|
|
#endif /* !NO_BIO */
|
2021-03-26 13:41:11 -07:00
|
|
|
|
#endif
|
2016-11-07 10:15:04 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2019-09-26 08:48:19 +10:00
|
|
|
|
if (doSTARTTLS && starttlsProt != NULL) {
|
2022-05-10 12:20:12 -05:00
|
|
|
|
if (XSTRCMP(starttlsProt, "smtp") == 0) {
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (SMTP_Shutdown(ssl, wc_shutdown) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-04-28 14:21:33 -06:00
|
|
|
|
err_sys("error closing STARTTLS connection");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2016-04-22 13:46:54 -06:00
|
|
|
|
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
2016-04-22 13:46:54 -06:00
|
|
|
|
CloseSocket(sockfd);
|
|
|
|
|
|
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-04-22 13:46:54 -06:00
|
|
|
|
|
|
|
|
|
|
((func_args*)args)->return_code = 0;
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2015-10-13 15:00:53 -07:00
|
|
|
|
#ifdef HAVE_ALPN
|
|
|
|
|
|
if (alpnList != NULL) {
|
|
|
|
|
|
char *protocol_name = NULL;
|
|
|
|
|
|
word16 protocol_nameSz = 0;
|
|
|
|
|
|
|
|
|
|
|
|
err = wolfSSL_ALPN_GetProtocol(ssl, &protocol_name, &protocol_nameSz);
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (err == WOLFSSL_SUCCESS)
|
2015-10-13 15:00:53 -07:00
|
|
|
|
printf("Received ALPN protocol : %s (%d)\n",
|
|
|
|
|
|
protocol_name, protocol_nameSz);
|
2017-10-18 10:38:27 -07:00
|
|
|
|
else if (err == WOLFSSL_ALPN_NOT_FOUND)
|
2015-10-13 15:00:53 -07:00
|
|
|
|
printf("No ALPN response received (no match with server)\n");
|
|
|
|
|
|
else
|
|
|
|
|
|
printf("Getting ALPN protocol name failed\n");
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2022-08-10 16:41:42 +02:00
|
|
|
|
#ifdef WOLFSSL_DTLS_CID
|
|
|
|
|
|
if (useDtlsCID && wolfSSL_dtls_cid_is_enabled(ssl)) {
|
|
|
|
|
|
unsigned char receivedCID[DTLS_CID_BUFFER_SIZE];
|
|
|
|
|
|
unsigned int receivedCIDSz;
|
|
|
|
|
|
|
|
|
|
|
|
printf("CID extension was negotiated\n");
|
|
|
|
|
|
ret = wolfSSL_dtls_cid_get_tx_size(ssl, &receivedCIDSz);
|
|
|
|
|
|
if (ret != WOLFSSL_SUCCESS)
|
|
|
|
|
|
err_sys("Can't get negotiated DTLS CID size\n");
|
|
|
|
|
|
|
|
|
|
|
|
if (receivedCIDSz > 0) {
|
|
|
|
|
|
ret = wolfSSL_dtls_cid_get_tx(ssl, receivedCID,
|
|
|
|
|
|
DTLS_CID_BUFFER_SIZE - 1);
|
|
|
|
|
|
if (ret != WOLFSSL_SUCCESS)
|
|
|
|
|
|
err_sys("Can't get negotiated DTLS CID\n");
|
|
|
|
|
|
|
|
|
|
|
|
printf("Sending CID is ");
|
|
|
|
|
|
printBuffer(receivedCID, receivedCIDSz);
|
|
|
|
|
|
printf("\n");
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
printf("other peer provided empty CID\n");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif /* WOLFSSL_DTLS_CID */
|
|
|
|
|
|
|
2014-09-24 18:48:23 -07:00
|
|
|
|
#ifdef HAVE_SECURE_RENEGOTIATION
|
2014-09-29 15:32:41 -07:00
|
|
|
|
if (scr && forceScr) {
|
2014-09-24 18:48:23 -07:00
|
|
|
|
if (nonBlocking) {
|
2020-08-25 11:26:20 +02:00
|
|
|
|
if (!resumeScr) {
|
2021-10-15 00:04:25 -05:00
|
|
|
|
if (wolfSSL_Rehandshake(ssl) != WOLFSSL_SUCCESS) {
|
2020-08-25 11:26:20 +02:00
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
if (err == WOLFSSL_ERROR_WANT_READ ||
|
|
|
|
|
|
err == WOLFSSL_ERROR_WANT_WRITE) {
|
2020-09-30 13:46:23 +02:00
|
|
|
|
if (scrAppData) {
|
|
|
|
|
|
ret = ClientWrite(ssl,
|
|
|
|
|
|
"msg sent during renegotiation",
|
|
|
|
|
|
sizeof("msg sent during renegotiation") - 1,
|
|
|
|
|
|
"", 1);
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
}
|
2020-09-25 11:35:23 +02:00
|
|
|
|
if (ret != 0) {
|
|
|
|
|
|
ret = WOLFSSL_FAILURE;
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
do {
|
2021-10-26 14:45:22 -07:00
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2020-09-25 11:35:23 +02:00
|
|
|
|
if (err == APP_DATA_READY) {
|
2021-10-15 00:04:25 -05:00
|
|
|
|
if (wolfSSL_read(ssl, reply,
|
|
|
|
|
|
sizeof(reply)-1) < 0) {
|
2020-09-25 11:35:23 +02:00
|
|
|
|
err_sys("APP DATA should be present "
|
|
|
|
|
|
"but error returned");
|
|
|
|
|
|
}
|
2020-09-30 13:46:23 +02:00
|
|
|
|
printf("Received message during "
|
|
|
|
|
|
"renegotiation: %s\n", reply);
|
2020-08-25 11:26:20 +02:00
|
|
|
|
}
|
2020-09-25 11:35:23 +02:00
|
|
|
|
err = 0;
|
|
|
|
|
|
if ((ret = wolfSSL_connect(ssl))
|
|
|
|
|
|
!= WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err = wolfSSL_get_error(ssl, ret);
|
|
|
|
|
|
}
|
|
|
|
|
|
} while (ret != WOLFSSL_SUCCESS &&
|
|
|
|
|
|
(err == WOLFSSL_ERROR_WANT_READ ||
|
2020-08-25 11:26:20 +02:00
|
|
|
|
err == WOLFSSL_ERROR_WANT_WRITE ||
|
2021-10-26 14:45:22 -07:00
|
|
|
|
err == APP_DATA_READY ||
|
|
|
|
|
|
err == WC_PENDING_E));
|
2020-09-25 11:35:23 +02:00
|
|
|
|
}
|
2020-08-25 11:26:20 +02:00
|
|
|
|
|
2021-10-26 14:45:22 -07:00
|
|
|
|
if (ret == WOLFSSL_SUCCESS) {
|
|
|
|
|
|
printf("NON-BLOCKING RENEGOTIATION SUCCESSFUL\n");
|
2020-08-25 11:26:20 +02:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2021-10-26 14:45:22 -07:00
|
|
|
|
if (ret != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "wolfSSL_Rehandshake error %d, %s\n", err,
|
2020-08-25 11:26:20 +02:00
|
|
|
|
wolfSSL_ERR_error_string(err, buffer));
|
|
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
err_sys("non-blocking wolfSSL_Rehandshake failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "not doing secure resumption with non-blocking");
|
2020-08-25 11:26:20 +02:00
|
|
|
|
}
|
2014-09-26 10:47:57 -07:00
|
|
|
|
} else {
|
2019-02-19 15:04:22 -08:00
|
|
|
|
if (!resumeScr) {
|
2020-07-21 13:34:25 -07:00
|
|
|
|
printf("Beginning secure renegotiation.\n");
|
2020-05-28 23:26:37 +02:00
|
|
|
|
if ((ret = wolfSSL_Rehandshake(ssl)) != WOLFSSL_SUCCESS) {
|
2019-02-19 15:04:22 -08:00
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
2020-05-28 23:26:37 +02:00
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
while (err == WC_PENDING_E) {
|
|
|
|
|
|
err = 0;
|
|
|
|
|
|
ret = wolfSSL_negotiate(ssl);
|
|
|
|
|
|
if (ret != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
if (ret != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
printf("err = %d, %s\n", err,
|
|
|
|
|
|
wolfSSL_ERR_error_string(err, buffer));
|
|
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
err_sys("wolfSSL_Rehandshake failed");
|
|
|
|
|
|
}
|
2019-02-19 15:04:22 -08:00
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
printf("RENEGOTIATION SUCCESSFUL\n");
|
|
|
|
|
|
}
|
2014-09-26 10:47:57 -07:00
|
|
|
|
}
|
2018-11-30 14:14:27 -08:00
|
|
|
|
else {
|
2019-02-19 15:04:22 -08:00
|
|
|
|
printf("Beginning secure resumption.\n");
|
2020-06-03 13:32:24 +02:00
|
|
|
|
if ((ret = wolfSSL_SecureResume(ssl)) != WOLFSSL_SUCCESS) {
|
2019-02-19 15:04:22 -08:00
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
2020-06-03 13:32:24 +02:00
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
while (err == WC_PENDING_E) {
|
|
|
|
|
|
err = 0;
|
|
|
|
|
|
ret = wolfSSL_negotiate(ssl);
|
|
|
|
|
|
if (ret != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err = wolfSSL_get_error(ssl, 0);
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
if (ret != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
printf("err = %d, %s\n", err,
|
|
|
|
|
|
wolfSSL_ERR_error_string(err, buffer));
|
|
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
err_sys("wolfSSL_SecureResume failed");
|
|
|
|
|
|
}
|
2019-02-19 15:04:22 -08:00
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
printf("SECURE RESUMPTION SUCCESSFUL\n");
|
|
|
|
|
|
}
|
2018-11-30 14:14:27 -08:00
|
|
|
|
}
|
2014-09-24 18:48:23 -07:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif /* HAVE_SECURE_RENEGOTIATION */
|
|
|
|
|
|
|
2020-07-21 13:34:25 -07:00
|
|
|
|
XMEMSET(msg, 0, sizeof(msg));
|
2012-08-01 12:55:13 -07:00
|
|
|
|
if (sendGET) {
|
2011-02-05 11:14:47 -08:00
|
|
|
|
printf("SSL connect ok, sending GET...\n");
|
2015-11-02 13:26:46 -08:00
|
|
|
|
|
2020-07-21 13:40:56 -07:00
|
|
|
|
msgSz = (int)XSTRLEN(kHttpGetMsg);
|
2020-07-21 13:34:25 -07:00
|
|
|
|
XMEMCPY(msg, kHttpGetMsg, msgSz);
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
2020-07-21 13:40:56 -07:00
|
|
|
|
msgSz = (int)XSTRLEN(kHelloMsg);
|
2020-07-21 13:34:25 -07:00
|
|
|
|
XMEMCPY(msg, kHelloMsg, msgSz);
|
2011-02-05 11:14:47 -08:00
|
|
|
|
}
|
2016-05-10 13:27:45 -06:00
|
|
|
|
|
|
|
|
|
|
/* allow some time for exporting the session */
|
|
|
|
|
|
#ifdef WOLFSSL_SESSION_EXPORT_DEBUG
|
2020-07-22 13:08:57 -07:00
|
|
|
|
TEST_DELAY();
|
2016-05-10 13:27:45 -06:00
|
|
|
|
#endif /* WOLFSSL_SESSION_EXPORT_DEBUG */
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
|
2022-01-19 13:03:29 +01:00
|
|
|
|
#ifdef WOLFSSL_SRTP
|
|
|
|
|
|
if (dtlsSrtpProfiles != NULL) {
|
2022-01-20 16:07:16 +01:00
|
|
|
|
err = client_srtp_test(ssl, (func_args*)args);
|
2022-01-19 13:03:29 +01:00
|
|
|
|
if (err != 0) {
|
|
|
|
|
|
if (exitWithRet) {
|
|
|
|
|
|
((func_args*)args)->return_code = err;
|
|
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
goto exit;
|
|
|
|
|
|
}
|
|
|
|
|
|
/* else */
|
|
|
|
|
|
err_sys("SRTP check failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2022-01-19 09:20:45 -08:00
|
|
|
|
#endif /* WOLFSSL_SRTP */
|
2022-01-19 13:03:29 +01:00
|
|
|
|
|
2016-11-24 01:31:07 +10:00
|
|
|
|
#ifdef WOLFSSL_TLS13
|
|
|
|
|
|
if (updateKeysIVs)
|
|
|
|
|
|
wolfSSL_update_keys(ssl);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2020-05-22 11:43:41 -07:00
|
|
|
|
err = ClientWrite(ssl, msg, msgSz, "", exitWithRet);
|
|
|
|
|
|
if (exitWithRet && (err != 0)) {
|
|
|
|
|
|
((func_args*)args)->return_code = err;
|
2020-07-23 14:32:48 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2020-05-22 11:43:41 -07:00
|
|
|
|
goto exit;
|
|
|
|
|
|
}
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2020-04-27 14:03:15 +10:00
|
|
|
|
err = ClientRead(ssl, reply, sizeof(reply)-1, 1, "", exitWithRet);
|
|
|
|
|
|
if (exitWithRet && (err != 0)) {
|
|
|
|
|
|
((func_args*)args)->return_code = err;
|
2020-07-23 14:32:48 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2020-04-27 14:03:15 +10:00
|
|
|
|
goto exit;
|
|
|
|
|
|
}
|
2017-06-08 10:32:51 +10:00
|
|
|
|
|
2018-06-08 17:34:03 +10:00
|
|
|
|
#if defined(WOLFSSL_TLS13)
|
|
|
|
|
|
if (updateKeysIVs || postHandAuth)
|
2020-05-22 11:43:41 -07:00
|
|
|
|
(void)ClientWrite(ssl, msg, msgSz, "", 0);
|
2017-06-21 16:56:51 +10:00
|
|
|
|
#endif
|
2012-10-17 13:13:58 -07:00
|
|
|
|
|
2022-05-20 10:00:24 +02:00
|
|
|
|
#if defined(HAVE_SESSION_TICKET)
|
|
|
|
|
|
while (waitTicket == 1) {
|
|
|
|
|
|
unsigned char ticketBuf[SESSION_TICKET_LEN];
|
|
|
|
|
|
int zeroReturn = 0;
|
|
|
|
|
|
word32 size;
|
|
|
|
|
|
|
|
|
|
|
|
(void)zeroReturn;
|
|
|
|
|
|
size = sizeof(ticketBuf);
|
|
|
|
|
|
err = wolfSSL_get_SessionTicket(ssl, ticketBuf, &size);
|
|
|
|
|
|
if (err < 0)
|
|
|
|
|
|
err_sys("wolfSSL_get_SessionTicket failed");
|
|
|
|
|
|
|
|
|
|
|
|
if (size == 0) {
|
|
|
|
|
|
err = process_handshake_messages(ssl, !nonBlocking, &zeroReturn);
|
|
|
|
|
|
if (err < 0)
|
|
|
|
|
|
err_sys("error waiting for session ticket ");
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
waitTicket = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2013-03-11 16:07:46 -07:00
|
|
|
|
#ifndef NO_SESSION_CACHE
|
2012-10-17 13:13:58 -07:00
|
|
|
|
if (resumeSession) {
|
2021-12-22 12:51:01 -08:00
|
|
|
|
session = wolfSSL_get1_session(ssl);
|
2012-08-02 11:54:49 -07:00
|
|
|
|
}
|
2013-03-11 16:07:46 -07:00
|
|
|
|
#endif
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2020-07-02 14:59:07 +02:00
|
|
|
|
#if !defined(NO_SESSION_CACHE) && (defined(OPENSSL_EXTRA) || \
|
|
|
|
|
|
defined(HAVE_EXT_CACHE))
|
2019-09-11 15:28:30 -07:00
|
|
|
|
if (session != NULL && resumeSession) {
|
|
|
|
|
|
flatSessionSz = wolfSSL_i2d_SSL_SESSION(session, NULL);
|
|
|
|
|
|
if (flatSessionSz != 0) {
|
|
|
|
|
|
int checkSz = wolfSSL_i2d_SSL_SESSION(session, &flatSession);
|
|
|
|
|
|
if (flatSession == NULL)
|
|
|
|
|
|
err_sys("error creating flattened session buffer");
|
2019-09-12 16:02:36 -07:00
|
|
|
|
if (checkSz != flatSessionSz) {
|
|
|
|
|
|
XFREE(flatSession, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
2019-09-11 15:28:30 -07:00
|
|
|
|
err_sys("flat session size check failure");
|
2019-09-12 16:02:36 -07:00
|
|
|
|
}
|
2021-12-22 12:51:01 -08:00
|
|
|
|
/* using heap based flat session, free original session */
|
|
|
|
|
|
wolfSSL_SESSION_free(session);
|
|
|
|
|
|
session = NULL;
|
2019-09-11 15:28:30 -07:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2022-04-06 22:14:42 +02:00
|
|
|
|
ret = wolfSSL_shutdown(ssl);
|
|
|
|
|
|
if (wc_shutdown && ret == WOLFSSL_SHUTDOWN_NOT_DONE) {
|
|
|
|
|
|
while (tcp_select(wolfSSL_get_fd(ssl), DEFAULT_TIMEOUT_SEC) ==
|
|
|
|
|
|
TEST_RECV_READY) {
|
|
|
|
|
|
ret = wolfSSL_shutdown(ssl); /* bidirectional shutdown */
|
|
|
|
|
|
if (ret == WOLFSSL_SUCCESS) {
|
|
|
|
|
|
printf("Bidirectional shutdown complete\n");
|
|
|
|
|
|
break;
|
2020-04-01 11:14:25 -05:00
|
|
|
|
}
|
2022-04-06 22:14:42 +02:00
|
|
|
|
else if (ret != WOLFSSL_SHUTDOWN_NOT_DONE) {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "Bidirectional shutdown failed\n");
|
2022-04-06 22:14:42 +02:00
|
|
|
|
break;
|
|
|
|
|
|
}
|
2020-02-17 16:39:34 -06:00
|
|
|
|
}
|
2022-04-06 22:14:42 +02:00
|
|
|
|
if (ret != WOLFSSL_SUCCESS)
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "Bidirectional shutdown failed\n");
|
2015-01-30 08:41:34 -07:00
|
|
|
|
}
|
2019-08-22 09:33:38 +10:00
|
|
|
|
#if defined(ATOMIC_USER) && !defined(WOLFSSL_AEAD_ONLY)
|
2013-08-09 17:27:15 -07:00
|
|
|
|
if (atomicUser)
|
|
|
|
|
|
FreeAtomicUser(ssl);
|
|
|
|
|
|
#endif
|
2017-10-20 14:56:29 -07:00
|
|
|
|
|
|
|
|
|
|
/* display collected statistics */
|
|
|
|
|
|
#ifdef WOLFSSL_STATIC_MEMORY
|
|
|
|
|
|
if (wolfSSL_is_static_memory(ssl, &ssl_stats) != 1)
|
|
|
|
|
|
err_sys("static memory was not used with ssl");
|
|
|
|
|
|
|
|
|
|
|
|
fprintf(stderr, "\nprint off SSL memory stats\n");
|
|
|
|
|
|
fprintf(stderr, "*** This is memory state before wolfSSL_free is called\n");
|
2021-10-21 11:47:00 -07:00
|
|
|
|
wolfSSL_PrintStatsConn(&ssl_stats);
|
2017-10-20 14:56:29 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(ssl); ssl = NULL;
|
2011-02-05 11:14:47 -08:00
|
|
|
|
CloseSocket(sockfd);
|
|
|
|
|
|
|
2013-03-11 16:07:46 -07:00
|
|
|
|
#ifndef NO_SESSION_CACHE
|
2012-10-17 13:13:58 -07:00
|
|
|
|
if (resumeSession) {
|
2017-10-23 10:50:19 -07:00
|
|
|
|
sslResume = wolfSSL_new(ctx);
|
|
|
|
|
|
if (sslResume == NULL) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2017-10-23 10:50:19 -07:00
|
|
|
|
err_sys("unable to get SSL object");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2018-12-03 13:53:44 -08:00
|
|
|
|
#if !defined(NO_DH) && !defined(WOLFSSL_OLD_PRIME_CHECK) && \
|
|
|
|
|
|
!defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
|
|
|
|
|
|
if (!doDhKeyCheck)
|
|
|
|
|
|
wolfSSL_SetEnableDhKeyTest(sslResume, 0);
|
|
|
|
|
|
#endif
|
2021-08-16 13:09:17 -07:00
|
|
|
|
#ifdef HAVE_PK_CALLBACKS
|
|
|
|
|
|
if (pkCallbacks) {
|
|
|
|
|
|
SetupPkCallbackContexts(sslResume, &pkCbInfo);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2018-12-03 13:53:44 -08:00
|
|
|
|
|
2016-08-25 22:20:35 -07:00
|
|
|
|
if (dtlsUDP) {
|
2020-07-22 13:08:57 -07:00
|
|
|
|
TEST_DELAY();
|
2012-10-17 13:13:58 -07:00
|
|
|
|
}
|
2016-08-25 22:20:35 -07:00
|
|
|
|
tcp_connect(&sockfd, host, port, dtlsUDP, dtlsSCTP, sslResume);
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_set_fd(sslResume, sockfd) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(sslResume); sslResume = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2016-03-25 13:59:04 -06:00
|
|
|
|
err_sys("error in setting fd");
|
|
|
|
|
|
}
|
2022-04-27 16:55:27 +02:00
|
|
|
|
if (simulateWantWrite) {
|
2022-05-12 16:48:04 +02:00
|
|
|
|
if (dtlsUDP) {
|
|
|
|
|
|
wolfSSL_SetIOWriteCtx(ssl, (void*)&sockfd);
|
|
|
|
|
|
udp_connect(&sockfd, host, port);
|
|
|
|
|
|
}
|
2022-04-27 16:55:27 +02:00
|
|
|
|
}
|
2015-10-13 15:00:53 -07:00
|
|
|
|
#ifdef HAVE_ALPN
|
|
|
|
|
|
if (alpnList != NULL) {
|
|
|
|
|
|
printf("ALPN accepted protocols list : %s\n", alpnList);
|
|
|
|
|
|
wolfSSL_UseALPN(sslResume, alpnList, (word32)XSTRLEN(alpnList),
|
|
|
|
|
|
alpn_opt);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2015-04-29 17:06:57 -07:00
|
|
|
|
#ifdef HAVE_SECURE_RENEGOTIATION
|
|
|
|
|
|
if (scr) {
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wolfSSL_UseSecureRenegotiation(sslResume) != WOLFSSL_SUCCESS) {
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(sslResume); sslResume = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2015-04-29 17:06:57 -07:00
|
|
|
|
err_sys("can't enable secure renegotiation");
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2015-04-29 17:06:57 -07:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2019-09-11 15:28:30 -07:00
|
|
|
|
|
2023-01-03 10:48:00 -08:00
|
|
|
|
#if !defined(NO_SESSION_CACHE) && (defined(OPENSSL_EXTRA) || \
|
|
|
|
|
|
defined(HAVE_EXT_CACHE))
|
2019-09-11 15:28:30 -07:00
|
|
|
|
if (flatSession) {
|
|
|
|
|
|
const byte* constFlatSession = flatSession;
|
|
|
|
|
|
session = wolfSSL_d2i_SSL_SESSION(NULL,
|
|
|
|
|
|
&constFlatSession, flatSessionSz);
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2022-12-12 11:44:27 -05:00
|
|
|
|
wolfSSL_set_session(sslResume, session);
|
2019-09-11 15:28:30 -07:00
|
|
|
|
|
2023-01-03 10:48:00 -08:00
|
|
|
|
#if !defined(NO_SESSION_CACHE) && (defined(OPENSSL_EXTRA) || \
|
|
|
|
|
|
defined(HAVE_EXT_CACHE))
|
2023-04-03 16:51:07 +10:00
|
|
|
|
XFREE(flatSession, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
2019-09-11 15:28:30 -07:00
|
|
|
|
#endif
|
2021-12-22 12:51:01 -08:00
|
|
|
|
wolfSSL_SESSION_free(session);
|
|
|
|
|
|
session = NULL;
|
|
|
|
|
|
|
2014-10-20 09:25:14 -07:00
|
|
|
|
#ifdef HAVE_SESSION_TICKET
|
2015-01-05 14:48:43 -07:00
|
|
|
|
wolfSSL_set_SessionTicket_cb(sslResume, sessionTicketCB,
|
2014-10-20 09:25:14 -07:00
|
|
|
|
(void*)"resumed session");
|
|
|
|
|
|
#endif
|
2016-11-24 01:31:07 +10:00
|
|
|
|
|
2015-01-05 14:48:43 -07:00
|
|
|
|
#ifndef WOLFSSL_CALLBACKS
|
2012-10-17 13:13:58 -07:00
|
|
|
|
if (nonBlocking) {
|
2018-05-23 16:07:45 -07:00
|
|
|
|
#ifdef WOLFSSL_DTLS
|
|
|
|
|
|
if (doDTLS) {
|
2020-04-08 09:46:22 +10:00
|
|
|
|
wolfSSL_dtls_set_using_nonblock(sslResume, 1);
|
2018-05-23 16:07:45 -07:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2012-10-17 13:13:58 -07:00
|
|
|
|
tcp_set_nonblocking(&sockfd);
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
ret = NonBlockingSSL_Connect(sslResume);
|
2012-10-17 13:13:58 -07:00
|
|
|
|
}
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
else {
|
2017-06-19 11:37:10 +10:00
|
|
|
|
#ifdef WOLFSSL_EARLY_DATA
|
|
|
|
|
|
#ifndef HAVE_SESSION_TICKET
|
|
|
|
|
|
if (!usePsk) {
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
#endif
|
|
|
|
|
|
if (earlyData) {
|
2020-07-21 13:34:25 -07:00
|
|
|
|
EarlyData(ctx, sslResume, kEarlyMsg, sizeof(kEarlyMsg)-1, buffer);
|
2017-06-19 11:37:10 +10:00
|
|
|
|
}
|
|
|
|
|
|
#endif
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
do {
|
|
|
|
|
|
err = 0; /* reset error */
|
|
|
|
|
|
ret = wolfSSL_connect(sslResume);
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (ret != WOLFSSL_SUCCESS) {
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
err = wolfSSL_get_error(sslResume, 0);
|
|
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
if (err == WC_PENDING_E) {
|
|
|
|
|
|
ret = wolfSSL_AsyncPoll(sslResume,
|
|
|
|
|
|
WOLF_POLL_FLAG_CHECK_HW);
|
|
|
|
|
|
if (ret < 0) break;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
} while (err == WC_PENDING_E);
|
2017-01-10 09:26:47 +10:00
|
|
|
|
}
|
2012-10-17 13:13:58 -07:00
|
|
|
|
#else
|
2020-04-08 09:46:22 +10:00
|
|
|
|
timeoutConnect.tv_sec = DEFAULT_TIMEOUT_SEC;
|
|
|
|
|
|
timeoutConnect.tv_usec = 0;
|
2018-04-13 11:53:42 +10:00
|
|
|
|
ret = NonBlockingSSL_Connect(sslResume); /* will keep retrying on timeout */
|
2012-08-20 17:02:25 -07:00
|
|
|
|
#endif
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (ret != WOLFSSL_SUCCESS) {
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "wolfSSL_connect resume error %d, %s\n", err,
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
wolfSSL_ERR_error_string(err, buffer));
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(sslResume); sslResume = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
Intel QuickAssist (QAT) support and async enhancements/fixes:
* Adds ./configure "--with-intelqa=../QAT1.6”, port files, memory management and README.md (see wolfcrypt/src/port/intel/).
* Added Intel QAT support for RSA public/private (CRT/non-CRT), AES CBC/GCM, ECDH/ECDSA, DH, DES3, SHA, SHA224, SHA256, SHA384, SHA512, MD5 and HMAC.
* wolfSSL async enabled all client and server: PKI, Encrypt/Decrypt, Hashing/HMAC and Certificate Sign/Verify.
* wolfSSL async support in functions: Encrypt, Decrypt, VerifyMAC, BuildMessage, ConfirmSignature, DoCertificate, ParseCertRelative, and MakeSignature.
* wolfCrypt test and benchmark async support added for all HW acceleration.
* wolfCrypt benchmark multi-threading support.
* Added QuickAssist memory overrides for XMALLOC, XFREE and XREALLOC. XREALLOC determines if existing pointer needs reallocated for NUMA.
* Refactor to make sure “heap” is available for async dev init.
* Added async support for all examples for connect, accept, read and write.
* Added new WC_BIGINT (in wolfmath.c) for async hardware support.
* Added async simulator tests for DES3 CBC, AES CBC/GCM.
* Added QAT standalone build for unit testing.
* Added int return code to SHA and MD5 functions.
* Refactor of the async stack variable handling, so async operations have generic args buffer area and cleanup function pointer.
* Combined duplicate code for async push/pop handling.
* Refactor internal.c to add AllocKey / FreeKey.
* Refactor of hash init/free in TLS to use InitHashes and FreeHashes.
* Refactor of the async event->context to use WOLF_EVENT_TYPE_ASYNC_WOLFSSL for WOLFSSL* and WOLF_EVENT_TYPE_ASYNC_WOLFCRYPT for WC_ASYNC_DEV*.
* Suppress error message for WC_PENDING_E.
* Implemented "wolfSSL_EVP_MD_CTX_init" to do memset.
* Cleanup of the openssl compat CTX sizes when async is enabled.
* Cleanup of AES, DES3, DH, SHA, MD5, DES3, DH, HMAC, MD5 for consistency and readability.
* Cleanup of the OPAQUE_LEN.
* Cleanup to use ENCRYPT_LEN instead of sizeof(ssl->arrays.preMasterSecret).
* Changed ssl->arrays.preMasterSecret to use XMALLOC (accelerates HW operations)
* Reduce verbosity with debug enabled for "GetMyVersion", "wolfSSL Using RSA OAEP padding" and "wolfSSL Using RSA PKCSV15 padding".
* Updated RSA un-padding error message so its different than one above it for better debugging.
* Added QAT async enables for each algorithm.
* Refactor of the async init to use _ex.
* Added WC_ASYNC_THRESH_NONE to allow bypass of the async thresholds for testing.
* Reformatted the benchmark results:
PKI: "RSA 2048 private HW 18522 ops took 1.003 sec, avg 0.054 ms, 18467.763 ops/sec"
Crypto/Hashing: SHA-256 SW 350 megs took 1.009 seconds, 346.946 MB/s Cycles per byte = 9.87
* Added min execution time for all benchmarks.
* Moved wc_*GetHash and wc_*RestorePos to appropriate files so use of isCopy flag is local.
* Fix for ECC sign status sometimes being invalid due to uninitialized ECC digest in benchmark.
* Added new DECLARE_VAR/FREE_VAR and DECLARE_ARRAY/FREE_ARRAY macros for helping setup test/benchmark variables to accelerate async.
* Added NO_SW_BENCH option to only run HW bench.
* Added support for PRNG to use hardware SHA256 if _wc devId provided.
* Fix to prevent curve tests from running against wrong curve sizes. Changed wc_ecc_set_curve to match on exact size.
* Added the wc_*GetHash calls to the wolfCrypt tests.
* Added async hardware start/stop to wolfSSL init/cleanup.
* Refactor to add wc_*Copy for hashing context (for async), which replaces wc_*RestorePos.
* Fixes for building with TI hashing (including: SHA224, missing new API’s and building with dummy build for non hw testing). Note: We need to add build test for this `./configure CFLAGS="-DWOLFSSL_TI_HASH -DTI_DUMMY_BUILD”`.
* Added arg checks on wc_*GetHash and wc_*Copy.
* Cleanup of the BuildMD5, BuildSHA, BuildMD5_CertVerify and BuildSHA_CertVerify functions.
* Added new ./configure --enable-asyncthreads, to allow enable/disable of the async threading support. If --enable-asynccrypt set this will be enabled by default if pthread is supported. Allows multi-threaded benchmarks with async simulator.
* Added checks for all hashing to verify valid ->buffLen.
* Fix for SHA512 scan-build warning about un-initialized “W_X”.
* Fix for valgrind un-initialized use of buffer in AllocDer (der->buffer) and BuildTlsFinished handshake_hash.
* Refactor of the benchmarking to use common function for start, check and finish of the stats.
* Fixed issue with ECC cache loading in multi-threading.
* Fix bug with AESNI not aligned code that assumes XMALLOC is 16-byte aligned.
* Added new WC_ASYNC_NO_… options to allow disabling of individual async algorithms. New defines are: WC_ASYNC_NO_CRYPT, WC_ASYNC_NO_PKI and WC_ASYNC_NO_HASH. Additionally each algorithm has a WC_ASYNC_NO_[ALGO] define.
* Added “wolfSSL_GetAllocators” API and fixed the wolfCrypt memcb_test so it restores callback pointers after test is complete (fixes issue with using custom allocators and test breaking it).
2017-04-07 15:46:32 -07:00
|
|
|
|
err_sys("wolfSSL_connect resume failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2018-10-20 13:40:01 +09:00
|
|
|
|
showPeerEx(sslResume, lng_index);
|
2021-12-07 14:07:47 -07:00
|
|
|
|
showPeerPEM(sslResume);
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2015-01-05 14:48:43 -07:00
|
|
|
|
if (wolfSSL_session_reused(sslResume))
|
2012-10-17 13:13:58 -07:00
|
|
|
|
printf("reused session id\n");
|
|
|
|
|
|
else
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "didn't reuse session id!!!\n");
|
2013-03-07 17:44:40 -08:00
|
|
|
|
|
2015-10-13 15:00:53 -07:00
|
|
|
|
#ifdef HAVE_ALPN
|
|
|
|
|
|
if (alpnList != NULL) {
|
|
|
|
|
|
char *protocol_name = NULL;
|
|
|
|
|
|
word16 protocol_nameSz = 0;
|
|
|
|
|
|
|
|
|
|
|
|
printf("Sending ALPN accepted list : %s\n", alpnList);
|
|
|
|
|
|
err = wolfSSL_ALPN_GetProtocol(sslResume, &protocol_name,
|
|
|
|
|
|
&protocol_nameSz);
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (err == WOLFSSL_SUCCESS)
|
2015-10-13 15:00:53 -07:00
|
|
|
|
printf("Received ALPN protocol : %s (%d)\n",
|
|
|
|
|
|
protocol_name, protocol_nameSz);
|
2017-10-18 10:38:27 -07:00
|
|
|
|
else if (err == WOLFSSL_ALPN_NOT_FOUND)
|
2015-10-13 15:00:53 -07:00
|
|
|
|
printf("Not received ALPN response (no match with server)\n");
|
|
|
|
|
|
else
|
|
|
|
|
|
printf("Getting ALPN protocol name failed\n");
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
2016-05-10 13:27:45 -06:00
|
|
|
|
|
|
|
|
|
|
/* allow some time for exporting the session */
|
|
|
|
|
|
#ifdef WOLFSSL_SESSION_EXPORT_DEBUG
|
2020-07-22 13:08:57 -07:00
|
|
|
|
TEST_DELAY();
|
2016-05-10 13:27:45 -06:00
|
|
|
|
#endif /* WOLFSSL_SESSION_EXPORT_DEBUG */
|
|
|
|
|
|
|
2019-12-26 16:39:44 -08:00
|
|
|
|
#ifdef HAVE_SECURE_RENEGOTIATION
|
|
|
|
|
|
if (scr && forceScr) {
|
|
|
|
|
|
if (nonBlocking) {
|
|
|
|
|
|
printf("not doing secure renegotiation on example with"
|
|
|
|
|
|
" nonblocking yet\n");
|
|
|
|
|
|
} else {
|
|
|
|
|
|
if (!resumeScr) {
|
2020-07-21 13:34:25 -07:00
|
|
|
|
printf("Beginning secure renegotiation.\n");
|
2019-12-26 16:39:44 -08:00
|
|
|
|
if (wolfSSL_Rehandshake(sslResume) != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err = wolfSSL_get_error(sslResume, 0);
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "err = %d, %s\n", err,
|
2019-12-26 16:39:44 -08:00
|
|
|
|
wolfSSL_ERR_error_string(err, buffer));
|
|
|
|
|
|
wolfSSL_free(sslResume); sslResume = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
err_sys("wolfSSL_Rehandshake failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
printf("RENEGOTIATION SUCCESSFUL\n");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
printf("Beginning secure resumption.\n");
|
|
|
|
|
|
if (wolfSSL_SecureResume(sslResume) != WOLFSSL_SUCCESS) {
|
|
|
|
|
|
err = wolfSSL_get_error(sslResume, 0);
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "err = %d, %s\n", err,
|
2019-12-26 16:39:44 -08:00
|
|
|
|
wolfSSL_ERR_error_string(err, buffer));
|
|
|
|
|
|
wolfSSL_free(sslResume); sslResume = NULL;
|
|
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
|
|
|
|
|
err_sys("wolfSSL_SecureResume failed");
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
printf("SECURE RESUMPTION SUCCESSFUL\n");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif /* HAVE_SECURE_RENEGOTIATION */
|
|
|
|
|
|
|
2020-07-21 15:42:33 -07:00
|
|
|
|
XMEMSET(msg, 0, sizeof(msg));
|
|
|
|
|
|
if (sendGET) {
|
|
|
|
|
|
msgSz = (int)XSTRLEN(kHttpGetMsg);
|
|
|
|
|
|
XMEMCPY(msg, kHttpGetMsg, msgSz);
|
|
|
|
|
|
}
|
|
|
|
|
|
else {
|
|
|
|
|
|
msgSz = (int)XSTRLEN(kResumeMsg);
|
|
|
|
|
|
XMEMCPY(msg, kResumeMsg, msgSz);
|
|
|
|
|
|
}
|
|
|
|
|
|
(void)ClientWrite(sslResume, msg, msgSz, " resume", 0);
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2020-04-27 14:03:15 +10:00
|
|
|
|
(void)ClientRead(sslResume, reply, sizeof(reply)-1, sendGET,
|
|
|
|
|
|
"Server resume: ", 0);
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2015-02-16 14:23:33 -08:00
|
|
|
|
ret = wolfSSL_shutdown(sslResume);
|
2017-10-11 09:09:52 -07:00
|
|
|
|
if (wc_shutdown && ret == WOLFSSL_SHUTDOWN_NOT_DONE)
|
2015-02-16 14:23:33 -08:00
|
|
|
|
wolfSSL_shutdown(sslResume); /* bidirectional shutdown */
|
|
|
|
|
|
|
2017-10-23 10:50:19 -07:00
|
|
|
|
/* display collected statistics */
|
|
|
|
|
|
#ifdef WOLFSSL_STATIC_MEMORY
|
|
|
|
|
|
if (wolfSSL_is_static_memory(sslResume, &ssl_stats) != 1)
|
|
|
|
|
|
err_sys("static memory was not used with ssl");
|
|
|
|
|
|
|
|
|
|
|
|
fprintf(stderr, "\nprint off SSLresume memory stats\n");
|
|
|
|
|
|
fprintf(stderr, "*** This is memory state before wolfSSL_free is called\n");
|
2021-10-21 11:47:00 -07:00
|
|
|
|
wolfSSL_PrintStatsConn(&ssl_stats);
|
2017-10-23 10:50:19 -07:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_free(sslResume); sslResume = NULL;
|
2013-02-14 14:09:41 -08:00
|
|
|
|
CloseSocket(sockfd);
|
2012-10-17 13:13:58 -07:00
|
|
|
|
}
|
2020-07-22 12:15:14 -07:00
|
|
|
|
#endif /* !NO_SESSION_CACHE */
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2018-07-27 10:19:04 -07:00
|
|
|
|
wolfSSL_CTX_free(ctx); ctx = NULL;
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
|
|
|
|
|
((func_args*)args)->return_code = 0;
|
2013-03-15 13:17:05 -07:00
|
|
|
|
|
2018-05-03 13:39:37 -07:00
|
|
|
|
exit:
|
|
|
|
|
|
|
2021-06-16 00:26:48 -05:00
|
|
|
|
#ifdef WOLFSSL_WOLFSENTRY_HOOKS
|
2023-01-05 00:13:17 -06:00
|
|
|
|
wolfsentry_ret =
|
2023-01-05 17:59:10 -06:00
|
|
|
|
wolfsentry_shutdown(WOLFSENTRY_CONTEXT_ARGS_OUT_EX4(&wolfsentry, NULL));
|
2021-06-16 00:26:48 -05:00
|
|
|
|
if (wolfsentry_ret < 0) {
|
|
|
|
|
|
fprintf(stderr,
|
|
|
|
|
|
"wolfsentry_shutdown() returned " WOLFSENTRY_ERROR_FMT "\n",
|
|
|
|
|
|
WOLFSENTRY_ERROR_FMT_ARGS(wolfsentry_ret));
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2016-08-15 13:59:41 -06:00
|
|
|
|
#ifdef WOLFSSL_ASYNC_CRYPT
|
|
|
|
|
|
wolfAsync_DevClose(&devId);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2019-02-22 17:14:19 +10:00
|
|
|
|
#if defined(HAVE_ECC) && defined(FP_ECC) && defined(HAVE_THREAD_LS) \
|
|
|
|
|
|
&& defined(HAVE_STACK_SIZE)
|
|
|
|
|
|
wc_ecc_fp_free(); /* free per thread cache */
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2016-04-11 13:39:44 -06:00
|
|
|
|
/* There are use cases when these assignments are not read. To avoid
|
|
|
|
|
|
* potential confusion those warnings have been handled here.
|
|
|
|
|
|
*/
|
|
|
|
|
|
(void) useClientCert;
|
|
|
|
|
|
(void) verifyCert;
|
|
|
|
|
|
(void) ourCert;
|
|
|
|
|
|
(void) ourKey;
|
2017-05-11 12:57:12 -07:00
|
|
|
|
(void) useVerifyCb;
|
2022-04-21 14:44:23 -07:00
|
|
|
|
(void) customVerifyCert;
|
2016-04-11 13:39:44 -06:00
|
|
|
|
|
2015-01-05 14:48:43 -07:00
|
|
|
|
#if !defined(WOLFSSL_TIRTOS)
|
2013-03-28 11:28:38 -07:00
|
|
|
|
return 0;
|
2014-05-08 15:52:20 -07:00
|
|
|
|
#endif
|
2011-02-05 11:14:47 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
2017-06-26 23:05:32 -07:00
|
|
|
|
#endif /* !NO_WOLFSSL_CLIENT */
|
|
|
|
|
|
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
|
|
|
|
|
/* so overall tests can pull in test function */
|
|
|
|
|
|
#ifndef NO_MAIN_DRIVER
|
|
|
|
|
|
|
|
|
|
|
|
int main(int argc, char** argv)
|
|
|
|
|
|
{
|
|
|
|
|
|
func_args args;
|
|
|
|
|
|
|
2013-02-01 12:21:38 -08:00
|
|
|
|
|
2011-02-05 11:14:47 -08:00
|
|
|
|
StartTCP();
|
|
|
|
|
|
|
2022-01-20 16:07:16 +01:00
|
|
|
|
#if defined(WOLFSSL_SRTP) && !defined(SINGLE_THREADED) && defined(_POSIX_THREADS)
|
2022-01-19 09:20:45 -08:00
|
|
|
|
args.srtp_helper = NULL;
|
2022-01-19 13:03:29 +01:00
|
|
|
|
#endif
|
2011-02-05 11:14:47 -08:00
|
|
|
|
args.argc = argc;
|
|
|
|
|
|
args.argv = argv;
|
2018-06-13 11:42:16 +10:00
|
|
|
|
args.return_code = 0;
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2015-01-05 14:48:43 -07:00
|
|
|
|
#if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_MDK_SHELL) && !defined(STACK_TRAP)
|
|
|
|
|
|
wolfSSL_Debugging_ON();
|
2011-02-05 11:14:47 -08:00
|
|
|
|
#endif
|
2016-03-23 10:21:26 -06:00
|
|
|
|
wolfSSL_Init();
|
2015-10-28 23:54:08 -07:00
|
|
|
|
ChangeToWolfRoot();
|
2015-10-14 19:13:45 -07:00
|
|
|
|
|
2017-06-26 23:05:32 -07:00
|
|
|
|
#ifndef NO_WOLFSSL_CLIENT
|
2013-03-28 11:28:38 -07:00
|
|
|
|
#ifdef HAVE_STACK_SIZE
|
|
|
|
|
|
StackSizeCheck(&args, client_test);
|
2015-10-14 19:13:45 -07:00
|
|
|
|
#else
|
2011-02-05 11:14:47 -08:00
|
|
|
|
client_test(&args);
|
2017-06-26 23:05:32 -07:00
|
|
|
|
#endif
|
2018-06-13 11:42:16 +10:00
|
|
|
|
#else
|
2022-05-12 13:07:32 -05:00
|
|
|
|
fprintf(stderr, "Client not compiled in!\n");
|
2013-03-28 11:28:38 -07:00
|
|
|
|
#endif
|
2015-01-05 14:48:43 -07:00
|
|
|
|
wolfSSL_Cleanup();
|
2011-02-05 11:14:47 -08:00
|
|
|
|
|
2016-05-05 15:31:25 -06:00
|
|
|
|
#ifdef HAVE_WNR
|
|
|
|
|
|
if (wc_FreeNetRandom() < 0)
|
|
|
|
|
|
err_sys("Failed to free netRandom context");
|
|
|
|
|
|
#endif /* HAVE_WNR */
|
|
|
|
|
|
|
2011-02-05 11:14:47 -08:00
|
|
|
|
return args.return_code;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2012-08-01 17:33:49 -07:00
|
|
|
|
int myoptind = 0;
|
|
|
|
|
|
char* myoptarg = NULL;
|
|
|
|
|
|
|
2011-02-05 11:14:47 -08:00
|
|
|
|
#endif /* NO_MAIN_DRIVER */
|