mirror of https://github.com/wolfSSL/wolfssl.git
correct line length to be shorter then 80 characters
parent
a83cf8584d
commit
17a0081261
|
@ -15000,7 +15000,11 @@ void bench_sphincsKeySign(byte level, byte optim)
|
||||||
#elif defined(__WATCOMC__)
|
#elif defined(__WATCOMC__)
|
||||||
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
WC_INLINE double current_time(int reset) { (void)reset; return ((double)clock())/CLOCKS_PER_SEC; }
|
WC_INLINE double current_time(int reset)
|
||||||
|
{
|
||||||
|
(void)reset;
|
||||||
|
return ((double)clock())/CLOCKS_PER_SEC;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
|
@ -1496,7 +1496,7 @@ static WC_INLINE void tcp_socket(SOCKET_T* sockfd, int udp, int sctp)
|
||||||
err_sys_with_errno("setsockopt TCP_NODELAY failed\n");
|
err_sys_with_errno("setsockopt TCP_NODELAY failed\n");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif /* !defined(USE_WINDOWS_API) && !defined(__WATCOMC__) && !defined(__OS2__) */
|
#endif /* !defined(USE_WINDOWS_API) && !defined(__WATCOMC__) && ... */
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(WOLFSSL_WOLFSENTRY_HOOKS) && defined(WOLFSENTRY_H)
|
#if defined(WOLFSSL_WOLFSENTRY_HOOKS) && defined(WOLFSENTRY_H)
|
||||||
|
|
|
@ -287,7 +287,8 @@ typedef byte ecc_oid_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if !defined(WOLFSSL_ECC_CURVE_STATIC) && defined(USE_WINDOWS_API) && !defined(__WATCOMC__)
|
#if !defined(WOLFSSL_ECC_CURVE_STATIC) && defined(USE_WINDOWS_API) && \
|
||||||
|
!defined(__WATCOMC__)
|
||||||
/* MSC does something different with the pointers to the arrays than GCC,
|
/* MSC does something different with the pointers to the arrays than GCC,
|
||||||
* and it causes the FIPS checksum to fail. In the case of windows builds,
|
* and it causes the FIPS checksum to fail. In the case of windows builds,
|
||||||
* store everything as arrays instead of pointers to strings. */
|
* store everything as arrays instead of pointers to strings. */
|
||||||
|
|
|
@ -127,7 +127,7 @@
|
||||||
#if defined(USE_WINDOWS_API)
|
#if defined(USE_WINDOWS_API)
|
||||||
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
|
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
|
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header */
|
||||||
#ifndef WOLFSSL_USER_IO
|
#ifndef WOLFSSL_USER_IO
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
#include <ws2tcpip.h> /* required for InetPton */
|
#include <ws2tcpip.h> /* required for InetPton */
|
||||||
|
@ -139,7 +139,7 @@
|
||||||
#if defined(USE_WINDOWS_API)
|
#if defined(USE_WINDOWS_API)
|
||||||
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
|
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
|
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header */
|
||||||
#include <process.h>
|
#include <process.h>
|
||||||
#ifndef WOLFSSL_USER_IO
|
#ifndef WOLFSSL_USER_IO
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
|
@ -172,7 +172,7 @@
|
||||||
#if !defined(WOLFSSL_SGX) && !defined(WOLFSSL_NOT_WINDOWS_API)
|
#if !defined(WOLFSSL_SGX) && !defined(WOLFSSL_NOT_WINDOWS_API)
|
||||||
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file. */
|
#define _WINSOCKAPI_ /* block inclusion of winsock.h header file. */
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
|
#undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header */
|
||||||
#ifndef WOLFSSL_USER_IO
|
#ifndef WOLFSSL_USER_IO
|
||||||
#include <winsock2.h>
|
#include <winsock2.h>
|
||||||
#include <ws2tcpip.h> /* required for InetPton */
|
#include <ws2tcpip.h> /* required for InetPton */
|
||||||
|
|
|
@ -895,10 +895,12 @@ WOLFSSL_API void wolfSSL_SetIOWriteFlags(WOLFSSL* ssl, int flags);
|
||||||
|
|
||||||
#ifndef XINET_NTOP
|
#ifndef XINET_NTOP
|
||||||
#if defined(__WATCOMC__)
|
#if defined(__WATCOMC__)
|
||||||
#if defined(__OS2__) || defined(__NT__) && (NTDDI_VERSION >= NTDDI_VISTA)
|
#if defined(__OS2__) || defined(__NT__) && \
|
||||||
|
(NTDDI_VERSION >= NTDDI_VISTA)
|
||||||
#define XINET_NTOP(a,b,c,d) inet_ntop((a),(b),(c),(d))
|
#define XINET_NTOP(a,b,c,d) inet_ntop((a),(b),(c),(d))
|
||||||
#else
|
#else
|
||||||
#define XINET_NTOP(a,b,c,d) strncpy((c),inet_ntoa(*(unsigned *)(b)),(d))
|
#define XINET_NTOP(a,b,c,d) \
|
||||||
|
strncpy((c),inet_ntoa(*(unsigned *)(b)),(d))
|
||||||
#endif
|
#endif
|
||||||
#elif defined(USE_WINDOWS_API) /* Windows-friendly definition */
|
#elif defined(USE_WINDOWS_API) /* Windows-friendly definition */
|
||||||
#define XINET_NTOP(a,b,c,d) InetNtop((a),(b),(c),(d))
|
#define XINET_NTOP(a,b,c,d) InetNtop((a),(b),(c),(d))
|
||||||
|
@ -908,7 +910,8 @@ WOLFSSL_API void wolfSSL_SetIOWriteFlags(WOLFSSL* ssl, int flags);
|
||||||
#endif
|
#endif
|
||||||
#ifndef XINET_PTON
|
#ifndef XINET_PTON
|
||||||
#if defined(__WATCOMC__)
|
#if defined(__WATCOMC__)
|
||||||
#if defined(__OS2__) || defined(__NT__) && (NTDDI_VERSION >= NTDDI_VISTA)
|
#if defined(__OS2__) || defined(__NT__) && \
|
||||||
|
(NTDDI_VERSION >= NTDDI_VISTA)
|
||||||
#define XINET_PTON(a,b,c) inet_pton((a),(b),(c))
|
#define XINET_PTON(a,b,c) inet_pton((a),(b),(c))
|
||||||
#else
|
#else
|
||||||
#define XINET_PTON(a,b,c) *(unsigned *)(c) = inet_addr((b))
|
#define XINET_PTON(a,b,c) *(unsigned *)(c) = inet_addr((b))
|
||||||
|
|
Loading…
Reference in New Issue