wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for building with C++17. Adds new USE_CPLUSPLUS_BYTE build option to use std::byte as byte to avoid redefinition issues when customer application sets default namespace to "std" or wants to use "byte".

Browse Source 
Tested using `./configure CC="g++ -std=c++17" --enable-all && make check`.
This commit is contained in:
David Garske
2023-02-28 17:29:04 -08:00
parent 7d049aa90a
commit 17ad27c350
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl.c
View File

@ -8868,8 +8868,8 @@ static int LoadSystemCaCertsMac(WOLFSSL_CTX* ctx, byte* loaded)
for (i = 0; ret == WOLFSSL_SUCCESS && for (i = 0; ret == WOLFSSL_SUCCESS &&
i < sizeof(trustDomains)/sizeof(*trustDomains); ++i) { i < sizeof(trustDomains)/sizeof(*trustDomains); ++i) {
stat = SecTrustSettingsCopyCertificates(trustDomains[i], &certs); stat = SecTrustSettingsCopyCertificates(
(SecTrustSettingsDomain)trustDomains[i], &certs);
if (stat == errSecSuccess) { if (stat == errSecSuccess) {
numCerts = CFArrayGetCount(certs); numCerts = CFArrayGetCount(certs);
for (j = 0; j < numCerts; ++j) { for (j = 0; j < numCerts; ++j) {

6
wolfssl/test.h
View File

@ -2033,7 +2033,8 @@ static WC_INLINE void tcp_listen(SOCKET_T* sockfd, word16* port, int useAnyAddr,
/* don't use INADDR_ANY by default, firewall may block, make user switch /* don't use INADDR_ANY by default, firewall may block, make user switch
on */ on */
build_addr(&addr, (useAnyAddr ? INADDR_ANY : wolfSSLIP), *port, udp, sctp); build_addr(&addr, (useAnyAddr ? (const char*)INADDR_ANY : wolfSSLIP),
*port, udp, sctp);
tcp_socket(sockfd, udp, sctp); tcp_socket(sockfd, udp, sctp);
#if !defined(USE_WINDOWS_API) && !defined(WOLFSSL_MDK_ARM)\ #if !defined(USE_WINDOWS_API) && !defined(WOLFSSL_MDK_ARM)\
@ -2111,7 +2112,8 @@ static WC_INLINE void udp_accept(SOCKET_T* sockfd, SOCKET_T* clientfd,
SOCKADDR_IN_T addr; SOCKADDR_IN_T addr;
(void)args; (void)args;
build_addr(&addr, (useAnyAddr ? INADDR_ANY : wolfSSLIP), port, 1, 0); build_addr(&addr, (useAnyAddr ? (const char*)INADDR_ANY : wolfSSLIP),
port, 1, 0);
tcp_socket(sockfd, 1, 0); tcp_socket(sockfd, 1, 0);

10
wolfssl/wolfcrypt/types.h
View File

@ -74,10 +74,18 @@ decouple library dependencies with standard string, memory and so on.
#ifndef WOLFSSL_TYPES #ifndef WOLFSSL_TYPES
#ifndef byte #ifndef byte
/* If using C++ C17 or later and getting:
* "error: reference to 'byte' is ambiguous", this is caused by
* cstddef conflict with "std::byte" in
* "enum class byte : unsigned char {};".
* This can occur if the user application is using "std" as the
* default namespace before including wolfSSL headers.
* Workarounds: https://github.com/wolfSSL/wolfssl/issues/5400
*/
typedef unsigned char byte; typedef unsigned char byte;
#endif
typedef signed char sword8; typedef signed char sword8;
typedef unsigned char word8; typedef unsigned char word8;
#endif
#ifdef WC_16BIT_CPU #ifdef WC_16BIT_CPU
typedef int sword16; typedef int sword16;
typedef unsigned int word16; typedef unsigned int word16;