Merge remote-tracking branch 'rich/platform' into development
* rich/platform:
modify library/memory_buffer_alloc.c, benchmark.c and the tests main code to use polarssl_exit
modify programs/*.c to use polarssl_snprintf
diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c
index 88561b1..e85350d 100644
--- a/programs/pkey/pk_sign.c
+++ b/programs/pkey/pk_sign.c
@@ -32,6 +32,7 @@
#include <stdio.h>
#define polarssl_snprintf snprintf
#define polarssl_printf printf
+#define polarssl_snprintf snprintf
#endif
#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) && \
diff --git a/programs/pkey/pk_verify.c b/programs/pkey/pk_verify.c
index d8cd9a1..923afc1 100644
--- a/programs/pkey/pk_verify.c
+++ b/programs/pkey/pk_verify.c
@@ -32,6 +32,7 @@
#include <stdio.h>
#define polarssl_snprintf snprintf
#define polarssl_printf printf
+#define polarssl_snprintf snprintf
#endif
#if defined(POLARSSL_BIGNUM_C) && \
diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c
index 2433096..ad4d0b5 100644
--- a/programs/pkey/rsa_sign_pss.c
+++ b/programs/pkey/rsa_sign_pss.c
@@ -32,6 +32,7 @@
#include <stdio.h>
#define polarssl_snprintf snprintf
#define polarssl_printf printf
+#define polarssl_snprintf snprintf
#endif
#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) && \
diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c
index 65fcfbe..2b1570a 100644
--- a/programs/pkey/rsa_verify_pss.c
+++ b/programs/pkey/rsa_verify_pss.c
@@ -32,6 +32,7 @@
#include <stdio.h>
#define polarssl_snprintf snprintf
#define polarssl_printf printf
+#define polarssl_snprintf snprintf
#endif
#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \
diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index e2dac43..ee2ea13 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -30,6 +30,7 @@
#include "polarssl/platform.h"
#else
#include <stdio.h>
+#define polarssl_printf printf
#define polarssl_fprintf fprintf
#define polarssl_printf printf
#define polarssl_snprintf snprintf
diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index edb7c07..675547b 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -30,8 +30,9 @@
#include "polarssl/platform.h"
#else
#include <stdio.h>
-#define polarssl_snprintf snprintf
+#define polarssl_exit exit
#define polarssl_printf printf
+#define polarssl_snprintf snprintf
#define polarssl_exit exit
#endif
diff --git a/programs/test/ssl_cert_test.c b/programs/test/ssl_cert_test.c
index 782d6f3..4978603 100644
--- a/programs/test/ssl_cert_test.c
+++ b/programs/test/ssl_cert_test.c
@@ -32,6 +32,7 @@
#include <stdio.h>
#define polarssl_snprintf snprintf
#define polarssl_printf printf
+#define polarssl_snprintf snprintf
#endif
#if defined(POLARSSL_RSA_C) && defined(POLARSSL_X509_CRT_PARSE_C) && \
diff --git a/tests/suites/main_test.function b/tests/suites/main_test.function
index bb1083a..d67d875 100644
--- a/tests/suites/main_test.function
+++ b/tests/suites/main_test.function
@@ -3,6 +3,7 @@
#if defined(POLARSSL_PLATFORM_C)
#include "polarssl/platform.h"
#else
+#include <stdio.h>
#define polarssl_exit exit
#define polarssl_free free
#define polarssl_malloc malloc