msvc2019 support

mcwin32/libmbedtls/win32/crypto_globals.c

@@ -1,4 +1,4 @@
-//$Id: crypto_globals.c,v 1.4 2021/11/08 13:13:02 cvsuser Exp $
+//$Id: crypto_globals.c,v 1.5 2021/11/08 14:40:45 cvsuser Exp $
 //
 //  libmbedcrypto support -
 //      retrieve the dynamic fprintf/snprintf/printf implementations (if required)
@@ -26,7 +26,7 @@ get_mbedtls_printf(void) {
 #if defined(MBEDTLS_PLATFORM_SNPRINTF_ALT)
 CRYPTO_MBEDAPI mbedtls_snprintf_t
 get_mbedtls_snprintf(void) {
-#undef mbedtls_snprintf   
+#undef mbedtls_snprintf
     return mbedtls_snprintf;
 }
 #endif
@@ -35,10 +35,62 @@ get_mbedtls_snprintf(void) {
 #if defined(MBEDTLS_PLATFORM_SNPRINTF_ALT)
 CRYPTO_MBEDAPI mbedtls_vsnprintf_t
 get_mbedtls_vsnprintf(void) {
-#undef mbedtls_vsnprintf   
+#undef mbedtls_vsnprintf
     return mbedtls_vsnprintf;
 }
 #endif
 
+
+/*
+ *  Optional toolchain components, supply allowing common def's
+ *
+ *  see: platform.h/.c
+ */
+
+#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER <= 1900) || defined(__WATCOMC__)
+#define HAVE_MBEDTLS_PLATFORM_HAS_NON_CONFORMING_SNPRINTF
+#define HAVE_MBEDTLS_PLATFORM_HAS_NON_CONFORMING_VSNPRINTF
+#endif
+
+
+#if !defined(HAVE_MBEDTLS_PLATFORM_HAS_NON_CONFORMING_SNPRINTF)
+int mbedtls_platform_win32_snprintf( char *s, size_t n, const char *fmt, ... )
+{
+    int ret = -1;
+    va_list argp;
+
+    va_start( argp, fmt );
+    ret = mbedtls_vsnprintf( s, n, fmt, argp );
+    va_end( argp );
+
+    return( ret );
+}
+#endif  //HAVE_MBEDTLS_PLATFORM_HAS_NON_CONFORMING_SNPRINTF
+
+
+#if !defined(HAVE_MBEDTLS_PLATFORM_HAS_NON_CONFORMING_VSNPRINTF)
+int mbedtls_platform_win32_vsnprintf( char *s, size_t n, const char *fmt, va_list arg )
+{
+    int ret = -1;
+
+    /* Avoid calling the invalid parameter handler by checking ourselves */
+    if( s == NULL || n == 0 || fmt == NULL )
+        return( -1 );
+
+#if defined(_TRUNCATE)
+    ret = vsnprintf_s( s, n, _TRUNCATE, fmt, arg );
+#else
+    ret = vsnprintf( s, n, fmt, arg );
+    if( ret < 0 || (size_t) ret == n )
+    {
+        s[n-1] = '\0';
+        ret = -1;
+    }
+#endif
+
+    return( ret );
+}
+#endif  //HAVE_MBEDTLS_PLATFORM_HAS_NON_CONFORMING_VSNPRINTF
+
 //end