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

Fix up random.h conflicts with cert 3389 releases and some NETOS issues

Browse Source
This commit is contained in:
kaleb-himes
2022-02-28 12:09:50 -07:00
parent c22282a8aa
commit ac7bd0aae8
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/test/test.c
View File

@ -156,7 +156,7 @@
#define NO_FILESYSTEM #define NO_FILESYSTEM
#elif defined(THREADX) && !defined(WOLFSSL_WICED) && \ #elif defined(THREADX) && !defined(WOLFSSL_WICED) && \
!defined(THREADX_NO_DC_PRINTF) !defined(THREADX_NO_DC_PRINTF)
#ifndef (NETOS) #ifndef NETOS
/* since just testing, use THREADX log printf instead (NETOS prototypes /* since just testing, use THREADX log printf instead (NETOS prototypes
* this elsewhere) */ * this elsewhere) */
int dc_log_printf(char*, ...); int dc_log_printf(char*, ...);

2
wolfssl/test.h
View File

@ -475,7 +475,7 @@ static WC_INLINE void InitTcpReady(tcp_ready* ready)
} }
#ifdef NETOS #ifdef NETOS
struct hostent* gethostbyname(vonst char* name); struct hostent* gethostbyname(const char* name);
#endif #endif
static WC_INLINE void FreeTcpReady(tcp_ready* ready) static WC_INLINE void FreeTcpReady(tcp_ready* ready)

9
wolfssl/wolfcrypt/asn_public.h
View File

@ -33,6 +33,7 @@ This library defines the interface APIs for X509 certificates.
#include <wolfssl/wolfcrypt/types.h> #include <wolfssl/wolfcrypt/types.h>
#include <wolfssl/wolfcrypt/dsa.h> #include <wolfssl/wolfcrypt/dsa.h>
#include <wolfssl/wolfcrypt/random.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -63,14 +64,6 @@ This library defines the interface APIs for X509 certificates.
typedef struct RsaKey RsaKey; typedef struct RsaKey RsaKey;
#define WC_RSAKEY_TYPE_DEFINED #define WC_RSAKEY_TYPE_DEFINED
#endif #endif
#ifndef WC_RNG_TYPE_DEFINED
typedef struct OS_Seed OS_Seed;
typedef struct WC_RNG WC_RNG;
#ifdef WC_RNG_SEED_CB
typedef int (*wc_RngSeed_Cb)(OS_Seed* os, byte* seed, word32 sz);
#endif
#define WC_RNG_TYPE_DEFINED
#endif
#ifndef WC_DH_TYPE_DEFINED #ifndef WC_DH_TYPE_DEFINED
typedef struct DhKey DhKey; typedef struct DhKey DhKey;
#define WC_DH_TYPE_DEFINED #define WC_DH_TYPE_DEFINED