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

Support for RTEMS in the DEOS user_settings.h template and time. Fix for `bio.c` and `OPENSSL_EXTRA` which needs `XATOI`. Fix for SP math ECC with 384-bit and 521-bit curves enabled.

pull/5630/head
David Garske 2022-09-25 10:41:05 -07:00
parent f80fb7f1aa
commit 55a0f6d97b
6 changed files with 169 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
IDE/ECLIPSE/DEOS/tls_wolfssl.c
View File

@ -31,19 +31,19 @@ int setupTransport(clientConnectionHandleType* connectionHandle,
char* connectionId) { char* connectionId) {
int ret, error; int ret, error;
void * sendBuffer; void * sendBuffer;
DWORD bufferSizeInBytes; size_t bufferSizeInBytes;
if ((ret = socketTransportInitialize("mailbox-transport.config", if ((ret = socketTransportInitialize("mailbox-transport.config",
"transportConfigurationId", "transportConfigurationId",
(DWORD)waitIndefinitely,&error)) != transportSuccess) waitIndefinitely,&error)) != transportSuccess)
printf("Initialize 0x%x, error=%d\n", ret, error); printf("Initialize 0x%x, error=%d\n", ret, error);
else if ((ret = socketTransportClientInitialize((DWORD)waitIndefinitely, else if ((ret = socketTransportClientInitialize(waitIndefinitely,
&error)) != transportSuccess) &error)) != transportSuccess)
printf("ClientInitialize 0x%x, error=%d\n", ret, error); printf("ClientInitialize 0x%x, error=%d\n", ret, error);
else if ((ret = socketTransportCreateConnection(connectionId, else if ((ret = socketTransportCreateConnection(connectionId,
(DWORD)waitIndefinitely, waitIndefinitely,
COMPATIBILITY_ID_2, COMPATIBILITY_ID_2,
connectionHandle, connectionHandle,
&sendBuffer, &sendBuffer,
@ -53,7 +53,7 @@ int setupTransport(clientConnectionHandleType* connectionHandle,
else if ((ret = socketTransportSetConnectionForThread(currentThreadHandle(), else if ((ret = socketTransportSetConnectionForThread(currentThreadHandle(),
*connectionHandle, *connectionHandle,
(DWORD)waitIndefinitely, waitIndefinitely,
&error)) != transportSuccess) &error)) != transportSuccess)
printf("SetConnectionForThread 0x%x, error=%d\n", ret, error); printf("SetConnectionForThread 0x%x, error=%d\n", ret, error);
@ -162,7 +162,7 @@ void wolfssl_client_test(uintData_t statusPtr) {
TCP_SERVER_IP_ADDR, TCP_SERVER_PORT); TCP_SERVER_IP_ADDR, TCP_SERVER_PORT);
server_addr.sin_family = AF_INET; server_addr.sin_family = AF_INET;
server_addr.sin_addr = inet_addr(TCP_SERVER_IP_ADDR); server_addr.sin_addr.s_addr = inet_addr(TCP_SERVER_IP_ADDR);
server_addr.sin_port = htons(TCP_SERVER_PORT); server_addr.sin_port = htons(TCP_SERVER_PORT);
printf("Calling connect on socket\n"); printf("Calling connect on socket\n");
@ -407,7 +407,7 @@ void wolfssl_server_test(uintData_t statusPtr)
printf("Setting up server_addr struct\n"); printf("Setting up server_addr struct\n");
server_addr.sin_family = AF_INET; server_addr.sin_family = AF_INET;
server_addr.sin_addr = INADDR_ANY; server_addr.sin_addr.s_addr = INADDR_ANY;
server_addr.sin_port = htons(TLS_SERVER_PORT); server_addr.sin_port = htons(TLS_SERVER_PORT);
bindStatus = bind(sock_listen, (sockaddr *) &server_addr, sizeof(server_addr)); bindStatus = bind(sock_listen, (sockaddr *) &server_addr, sizeof(server_addr));
@ -510,7 +510,7 @@ void wolfssl_server_test(uintData_t statusPtr)
wolfSSL_CTX_free(ctx); wolfSSL_CTX_free(ctx);
return; return;
} }
/* goToSleep() for 500 milli sec*/ /* goToSleep() for 500 milliseconds */
} }
} while ((ret != SSL_SUCCESS) && (error == SSL_ERROR_WANT_READ)); } while ((ret != SSL_SUCCESS) && (error == SSL_ERROR_WANT_READ));
@ -580,14 +580,14 @@ int wolfsslRunTests (void)
ts = createThread("TCPclient", "TCPThreadTemplate", wolfssl_client_test, ts = createThread("TCPclient", "TCPThreadTemplate", wolfssl_client_test,
0, &TCPhandle ); 0, &TCPhandle );
if (ts != threadSuccess) { if (ts != threadSuccess) {
printf("Unable to create TCP client thread, %i ", (DWORD)ts); printf("Unable to create TCP client thread, %i ", (size_t)ts);
} }
#endif #endif
#if !defined(NO_WOLFSSL_SERVER) #if !defined(NO_WOLFSSL_SERVER)
ts = createThread("TCPserver", "TCPThreadTemplate", wolfssl_server_test, ts = createThread("TCPserver", "TCPThreadTemplate", wolfssl_server_test,
0, &TCPhandle ); 0, &TCPhandle );
if (ts != threadSuccess) { if (ts != threadSuccess) {
printf("Unable to create TCP server thread, %i ", (DWORD)ts); printf("Unable to create TCP server thread, %i ", (size_t)ts);
} }
#endif #endif

185
IDE/ECLIPSE/DEOS/user_settings.h
View File

@ -26,75 +26,141 @@
extern "C" { extern "C" {
#endif #endif
#define WOLFSSL_DEOS #if 0
/* RTEMS */
#define WOLFSSL_DEOS_RTEMS
/* You can select none or all of the following tests #include <stdio.h>
using #define instead of #undef. #include <string.h>
By default, all four tests run*/ #include <netinet/in.h>
#include <sys/socket.h>
#include <pthread.h>
#include <stdint.h>
#include <stddef.h> /* for size_t */
#include <stdlib.h> /* for malloc/free */
#undef NO_CRYPT_TEST #if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
#undef NO_CRYPT_BENCHMARK #define BIG_ENDIAN_ORDER
#undef NO_WOLFSSL_CLIENT #else
#undef NO_WOLFSSL_SERVER #undef BIG_ENDIAN_ORDER
#define LITTLE_ENDIAN_ORDER
#endif
#else
/* DEOS Native */
#define WOLFSSL_DEOS
#include <deos.h>
#include <timeout.h>
#include <socketapi.h>
#include <lwip-socket.h>
#include <mem.h>
#include <string.h>
#include <stdlib.h> /* for rand_r: pseudo-random number generator */
#include <stdio.h> /* for snprintf */
#endif
/* Porting */
/* adjust CURRENT_UNIX_TIMESTAMP to seconds since Jan 01 1970. (UTC) /* adjust CURRENT_UNIX_TIMESTAMP to seconds since Jan 01 1970. (UTC)
You can get the current time from https://www.unixtimestamp.com/ You can get the current time from https://www.unixtimestamp.com/ */
*/ #define CURRENT_UNIX_TIMESTAMP 1663020069
#define CURRENT_UNIX_TIMESTAMP 1545864916
#define NO_FILESYSTEM #define BENCH_EMBEDDED /* use kB instead of mB for embedded benchmarking */
#define WOLFSSL_IGNORE_FILE_WARN /* ignore warning for include of files not required */
/* Math */
#define USE_FAST_MATH
#define FP_MAX_BITS (4096*2)
#define SIZEOF_LONG_LONG 8 #define SIZEOF_LONG_LONG 8
#define TFM_TIMING_RESISTANT
#define ECC_TIMING_RESISTANT
#define WC_RSA_BLINDING
/* prevents from including multiple definition of main() */ /* Wolf Single Precision Math */
#define NO_MAIN_DRIVER #undef WOLFSSL_SP
#define NO_TESTSUITE_MAIN_DRIVER #if 1
#define WOLFSSL_HAVE_SP_RSA
#define WOLFSSL_HAVE_SP_DH
#define WOLFSSL_HAVE_SP_ECC
#define WOLFSSL_SP_4096 /* Enable RSA/RH 4096-bit support */
#define WOLFSSL_SP_384 /* Enable ECC 384-bit SECP384R1 support */
/* includes certificate test buffers via header files */ //#define WOLFSSL_SP_CACHE_RESISTANT
#define USE_CERT_BUFFERS_2048 #define WOLFSSL_SP_MATH /* only SP math - disables integer.c/tfm.c */
//#define WOLFSSL_SP_MATH_ALL /* use SP math for all key sizes and curves */
/*use kB instead of mB for embedded benchmarking*/ #define WOLFSSL_SP_NO_MALLOC
#define BENCH_EMBEDDED //#define WOLFSSL_SP_DIV_32 /* do not use 64-bit divides */
#define NO_WRITE_TEMP_FILES /* use smaller version of code */
#define WOLFSSL_SP_SMALL
#endif
#define HAVE_AESGCM /* Algorithms */
#define WOLFSSL_SHA512 #undef NO_RSA
#undef NO_DH
#define WOLFSSL_DH_CONST
#define HAVE_ECC #define HAVE_ECC
#define HAVE_CURVE25519 #define ECC_USER_CURVES
#define CURVE25519_SMALL #define HAVE_ECC384
#define HAVE_ED25519
#define ED25519_SMALL
#define WOLFSSL_DTLS #if 1
#define HAVE_CURVE25519
#define HAVE_ED25519
#define CURVED25519_SMALL
#endif
#undef NO_SHA
#undef NO_MD5
#undef NO_SHA256
#define HAVE_AESGCM
#define WOLFSSL_SHA384
#define WOLFSSL_SHA512
/* TLS */
#define HAVE_TLS_EXTENSIONS
#define HAVE_SUPPORTED_CURVES
#define HAVE_EXTENDED_MASTER
#define HAVE_ENCRYPT_THEN_MAC
//#define WOLFSSL_DTLS
//#define WOLFSSL_DTLS13
//#define WOLFSSL_NO_TLS12
/* TLS 1.3 */
#if 0 #if 0
/* TLS 1.3 */
#define WOLFSSL_TLS13 #define WOLFSSL_TLS13
#define WC_RSA_PSS #define WC_RSA_PSS
#define HAVE_HKDF #define HAVE_HKDF
#define HAVE_FFDHE_2048 #define HAVE_FFDHE_2048
#define HAVE_AEAD #define HAVE_FFDHE_3072
#define HAVE_FFDHE_4096
#endif #endif
/* wolfSentry */
#if 0 #if 0
#define WOLFSSL_WOLFSENTRY_HOOKS
/* You can use your own custom random generator function with #define HAVE_EX_DATA
no input parameters and a `CUSTOM_RAND_TYPE` return type*/ #define HAVE_EX_DATA_CLEANUP_HOOKS
#ifndef CUSTOM_RAND_GENERATE
#define CUSTOM_RAND_TYPE int
#define CUSTOM_RAND_GENERATE yourRandGenFunc
#endif
#endif #endif
#if 1 /* compatibility layer */
#undef XMALLOC_OVERRIDE #if 0
#define OPENSSL_EXTRA
#endif
/* Random */
#ifdef WOLFSSL_DEOS_RTEMS
extern int rtems_wolf_seed(unsigned char* output, unsigned int sz);
#define CUSTOM_RAND_GENERATE_SEED rtems_wolf_seed
#endif
/* custom heap handling */
#ifdef WOLFSSL_DEOS
#define WOLFSSL_NO_MALLOC
#define XMALLOC_OVERRIDE #define XMALLOC_OVERRIDE
/* prototypes for user heap override functions */ /* prototypes for user heap override functions */
#include <stddef.h> /* for size_t */
extern void *malloc_deos(size_t size); extern void *malloc_deos(size_t size);
extern void free_deos(void *ptr); extern void free_deos(void *ptr);
extern void *realloc_deos(void *ptr, size_t size); extern void *realloc_deos(void *ptr, size_t size);
@ -102,9 +168,40 @@ You can get the current time from https://www.unixtimestamp.com/
#define XMALLOC(n, h, t) malloc_deos(n) #define XMALLOC(n, h, t) malloc_deos(n)
#define XFREE(p, h, t) free_deos(p) #define XFREE(p, h, t) free_deos(p)
#define XREALLOC(p, n, h, t) realloc_deos(p, n) #define XREALLOC(p, n, h, t) realloc_deos(p, n)
#endif #endif
#if 0
#define DEBUG_WOLFSSL
#endif
/* You can select none or all of the following tests
* using #define instead of #undef.
* By default, all four tests run*/
#define NO_CRYPT_TEST
#define NO_CRYPT_BENCHMARK
#undef NO_WOLFSSL_CLIENT
#undef NO_WOLFSSL_SERVER
/* file system has not been ported since it is a separate product */
#define NO_FILESYSTEM
#define NO_WOLFSSL_DIR
#define NO_WRITEV
#define NO_WRITE_TEMP_FILES
/* disable old protocols and algorithms */
#define NO_OLD_TLS
#define NO_PSK
#define NO_DSA
#define NO_RC4
#define NO_MD4
#define NO_PWDBASED
/* prevents from including multiple definition of main() */
#define NO_MAIN_DRIVER
#define NO_TESTSUITE_MAIN_DRIVER
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif

4
wolfcrypt/src/wc_port.c
View File

@ -2445,7 +2445,7 @@ time_t pic32_time(time_t* timer)
#endif /* MICROCHIP_TCPIP || MICROCHIP_TCPIP_V5 */ #endif /* MICROCHIP_TCPIP || MICROCHIP_TCPIP_V5 */
#if defined(WOLFSSL_DEOS) #if defined(WOLFSSL_DEOS) || defined(WOLFSSL_DEOS_RTEMS)
time_t deos_time(time_t* timer) time_t deos_time(time_t* timer)
{ {
@ -2462,7 +2462,7 @@ time_t deos_time(time_t* timer)
return (time_t) *systemTickPtr/systemTickTimeInHz; return (time_t) *systemTickPtr/systemTickTimeInHz;
#endif #endif
} }
#endif /* WOLFSSL_DEOS */ #endif /* WOLFSSL_DEOS || WOLFSSL_DEOS_RTEMS */
#if defined(FREESCALE_RTC) #if defined(FREESCALE_RTC)
#include "fsl_rtc.h" #include "fsl_rtc.h"

11
wolfssl/wolfcrypt/settings.h
View File

@ -1935,7 +1935,16 @@ extern void uITRON4_free(void *p) ;
/* user can specify what curves they want with ECC_USER_CURVES otherwise /* user can specify what curves they want with ECC_USER_CURVES otherwise
* all curves are on by default for now */ * all curves are on by default for now */
#ifndef ECC_USER_CURVES #ifndef ECC_USER_CURVES
#if !defined(WOLFSSL_SP_MATH) && !defined(HAVE_ALL_CURVES) #ifdef WOLFSSL_SP_MATH
/* for single precision math only make sure the enabled key sizes are
* included in the ECC curve table */
#if defined(WOLFSSL_SP_384) && !defined(HAVE_ECC384)
#define HAVE_ECC384
#endif
#if defined(WOLFSSL_SP_521) && !defined(HAVE_ECC521)
#define HAVE_ECC521
#endif
#elif !defined(HAVE_ALL_CURVES)
#define HAVE_ALL_CURVES #define HAVE_ALL_CURVES
#endif #endif
#endif #endif

2
wolfssl/wolfcrypt/types.h
View File

@ -788,7 +788,7 @@ typedef struct w64wrapper {
#if defined(WOLFSSL_CERT_EXT) || defined(HAVE_OCSP) || \ #if defined(WOLFSSL_CERT_EXT) || defined(HAVE_OCSP) || \
defined(HAVE_CRL_IO) || defined(HAVE_HTTP_CLIENT) || \ defined(HAVE_CRL_IO) || defined(HAVE_HTTP_CLIENT) || \
!defined(NO_CRYPT_BENCHMARK) !defined(NO_CRYPT_BENCHMARK) || defined(OPENSSL_EXTRA)
#ifndef XATOI /* if custom XATOI is not already defined */ #ifndef XATOI /* if custom XATOI is not already defined */
#include <stdlib.h> #include <stdlib.h>

7
wolfssl/wolfcrypt/wc_port.h
View File

@ -764,9 +764,12 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
#define XTIME(tl) (0) #define XTIME(tl) (0)
#define XGMTIME(c, t) rtpsys_gmtime((c)) #define XGMTIME(c, t) rtpsys_gmtime((c))
#elif defined(WOLFSSL_DEOS) #elif defined(WOLFSSL_DEOS) || defined(WOLFSSL_DEOS_RTEMS)
#include <time.h> #include <time.h>
#ifndef XTIME
extern time_t deos_time(time_t* timer);
#define XTIME(t1) deos_time((t1))
#endif
#elif defined(MICRIUM) #elif defined(MICRIUM)
#include <clk.h> #include <clk.h>
#include <time.h> #include <time.h>