forked from wolfSSL/wolfssl
add NetX default IO context handling
This commit is contained in:
@@ -82,10 +82,29 @@
|
||||
#define SIZEOF_LONG_LONG 8
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef COMVERGE
|
||||
#define THREADX
|
||||
#define HAVE_NETX
|
||||
#define CYASSL_USER_IO
|
||||
#define NO_WRITEV
|
||||
#define NO_DEV_RANDOM
|
||||
#define NO_FILESYSTEM
|
||||
#define NO_SHA512
|
||||
#define NO_DH
|
||||
#define NO_DSA
|
||||
#define NO_HC128
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef THREADX
|
||||
#define SIZEOF_LONG_LONG 8
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_NETX
|
||||
#include "nx_api.h"
|
||||
#endif
|
||||
|
||||
#ifdef MICROCHIP_PIC32
|
||||
#define SIZEOF_LONG_LONG 8
|
||||
#define SINGLE_THREADED
|
||||
|
||||
@@ -100,6 +100,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef HAVE_LIBZ
|
||||
#include "zlib.h"
|
||||
#endif
|
||||
@@ -942,6 +943,11 @@ int SetCipherList(Suites*, const char* list);
|
||||
#endif /* CYASSL_DTLS */
|
||||
#endif /* CYASSL_USER_IO */
|
||||
|
||||
#ifdef HAVE_NETX
|
||||
CYASSL_LOCAL int NetX_Receive(CYASSL *ssl, char *buf, int sz, void *ctx);
|
||||
CYASSL_LOCAL int NetX_Send(CYASSL *ssl, char *buf, int sz, void *ctx);
|
||||
#endif /* HAVE_NETX */
|
||||
|
||||
|
||||
/* CyaSSL Cipher type just points back to SSL */
|
||||
struct CYASSL_CIPHER {
|
||||
@@ -1692,6 +1698,19 @@ typedef struct DtlsMsg {
|
||||
} DtlsMsg;
|
||||
|
||||
|
||||
#ifdef HAVE_NETX
|
||||
|
||||
/* NETX I/O Callback default */
|
||||
typedef struct NetX_Ctx {
|
||||
NX_TCP_SOCKET* nxSocket; /* send/recv socket handle */
|
||||
NX_PACKET* nxPacket; /* incoming packet handle for short reads */
|
||||
ULONG nxOffset; /* offset already read from nxPacket */
|
||||
ULONG nxWait; /* wait option flag */
|
||||
} NetX_Ctx;
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
/* CyaSSL ssl type */
|
||||
struct CYASSL {
|
||||
CYASSL_CTX* ctx;
|
||||
@@ -1794,6 +1813,9 @@ struct CYASSL {
|
||||
#ifdef HAVE_MAX_FRAGMENT
|
||||
word16 max_fragment;
|
||||
#endif
|
||||
#endif
|
||||
#ifdef HAVE_NETX
|
||||
NetX_Ctx nxCtx; /* NetX IO Context */
|
||||
#endif
|
||||
CYASSL_ALERT_HISTORY alert_history;
|
||||
};
|
||||
|
||||
@@ -838,6 +838,11 @@ CYASSL_API void CyaSSL_SetIOWriteCtx(CYASSL* ssl, void *ctx);
|
||||
CYASSL_API void CyaSSL_SetIOReadFlags( CYASSL* ssl, int flags);
|
||||
CYASSL_API void CyaSSL_SetIOWriteFlags(CYASSL* ssl, int flags);
|
||||
|
||||
#ifdef HAVE_NETX
|
||||
CYASSL_API void CyaSSL_SetIO_NetX(CYASSL* ssl, NX_TCP_SOCKET* nxsocket,
|
||||
ULONG waitoption);
|
||||
#endif
|
||||
|
||||
typedef int (*CallbackGenCookie)(CYASSL* ssl, unsigned char* buf, int sz,
|
||||
void* ctx);
|
||||
CYASSL_API void CyaSSL_CTX_SetGenCookie(CYASSL_CTX*, CallbackGenCookie);
|
||||
|
||||
@@ -26,8 +26,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define LIBCYASSL_VERSION_STRING "2.7.0"
|
||||
#define LIBCYASSL_VERSION_HEX 0x02007000
|
||||
#define LIBCYASSL_VERSION_STRING "2.7.1"
|
||||
#define LIBCYASSL_VERSION_HEX 0x02007001
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user