feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Handle older MSC versions

Browse Source
This commit is contained in:
Eric Blankenhorn
2019-03-07 12:07:00 -06:00
parent 934c1b7952
commit be83a54f22
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wolfssl/wolfcrypt/types.h
View File

@@ -382,13 +382,27 @@
/* snprintf is used in asn.c for GetTimeString, PKCS7 test, and when /* snprintf is used in asn.c for GetTimeString, PKCS7 test, and when
debugging is turned on */ debugging is turned on */
#if defined(NO_FILESYSTEM) && (defined(OPENSSL_EXTRA) || \ #ifndef USE_WINDOWS_API
defined(HAVE_PKCS7)) && !defined(NO_STDIO_FILESYSTEM) #if defined(NO_FILESYSTEM) && (defined(OPENSSL_EXTRA) || \
/* case where stdio is not included else where but is needed for defined(HAVE_PKCS7)) && !defined(NO_STDIO_FILESYSTEM)
* snprintf */ /* case where stdio is not included else where but is needed
#include <stdio.h> for snprintf */
#include <stdio.h>
#endif
#define XSNPRINTF snprintf
#else
#if defined(_MSC_VER) && (_MSC_VER >= 1900)
/* Beginning with the UCRT in Visual Studio 2015 and
Windows 10, snprintf is no longer identical to
_snprintf. The snprintf function behavior is now
C99 standard compliant. */
#define XSNPRINTF snprintf
#else
/* _snprintf only null terminates the string if return len
is less than count */
#define XSNPRINTF _snprintf
#endif
#endif #endif
#define XSNPRINTF snprintf
#if defined(WOLFSSL_CERT_EXT) || defined(HAVE_ALPN) #if defined(WOLFSSL_CERT_EXT) || defined(HAVE_ALPN)
/* use only Thread Safe version of strtok */ /* use only Thread Safe version of strtok */