Pass platform context to tests

Add platform context as a parameter for tests to enable the usage of it in
cryptographic calls

Author: Andrzej Kurek

authcrypt/authcrypt.cpp

@@ -28,8 +28,6 @@
 #include "mbedtls/debug.h"
 #endif
 
-#include "mbedtls/platform.h"
-
 #include <string.h>
 
 const unsigned char Authcrypt::secret_key[16] = {
@@ -41,8 +39,9 @@ const char Authcrypt::message[] = "Some things are better left unread";
 
 const char Authcrypt::metadata[] = "eg sequence number, routing info";
 
-Authcrypt::Authcrypt()
+Authcrypt::Authcrypt(mbedtls_platform_context* platform_ctx)
 {
+    _platform_ctx = platform_ctx;
     memset(ciphertext, 0, sizeof(ciphertext));
     memset(decrypted, 0, sizeof(decrypted));
 

authcrypt/authcrypt.h

@@ -23,6 +23,7 @@
 #include "mbedtls/cipher.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
+#include "mbedtls/platform.h"
 
 /**
  * This class implements the logic to demonstrate authenticated encryption using
@@ -34,7 +35,7 @@ class Authcrypt
     /**
      * Construct an Authcrypt instance
      */
-    Authcrypt();
+    Authcrypt(mbedtls_platform_context* platform_ctx);
 
     /**
      * Free any allocated resources
@@ -103,6 +104,11 @@ class Authcrypt
      * The block cipher configuration
      */
     mbedtls_cipher_context_t cipher;
+    
+    /**
+     * The platform context
+     */
+    mbedtls_platform_context* _platform_ctx;
 };
 
 #endif /* _AUTHCRYPT_H_ */

authcrypt/main.cpp

@@ -30,7 +30,7 @@ int main() {
     }
 
     int exit_code = MBEDTLS_EXIT_SUCCESS;
-    Authcrypt *authcrypt = new Authcrypt();
+    Authcrypt *authcrypt = new Authcrypt(&platform_ctx);
 
     if (authcrypt->run() != 0) {
         exit_code = MBEDTLS_EXIT_FAILURE;

benchmark/main.cpp

@@ -300,7 +300,7 @@ typedef struct {
          rsa, dhm, ecdsa, ecdh;
 } todo_list;
 
-static int benchmark( int argc, char *argv[] )
+static int benchmark( int argc, char *argv[], mbedtls_platform_context* ctx )
 {
     int i;
     unsigned char tmp[200];
@@ -309,7 +309,9 @@ static int benchmark( int argc, char *argv[] )
 #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
     unsigned char malloc_buf[HEAP_SIZE] = { 0 };
 #endif
-
+    // The call below is used to avoid the "unused parameter" warning.
+    // The context itself can be used by cryptographic calls which require it.
+    (void)ctx;
     if( argc <= 1 )
     {
         memset( &todo, 1, sizeof( todo ) );
@@ -966,7 +968,7 @@ int main(void) {
         return -1;
     }
 
-    int ret = benchmark(0, NULL);
+    int ret = benchmark(0, NULL, &platform_ctx);
     if (ret != 0) {
         mbedtls_printf("Benchmark failed with error %d\r\n", ret);
     }

hashing/main.cpp

@@ -47,8 +47,12 @@ static const char hello_str[] = "Hello, world!";
 static const unsigned char *hello_buffer = (const unsigned char *) hello_str;
 static const size_t hello_len = strlen(hello_str);
 
-static int example(void)
+static int example(mbedtls_platform_context* ctx)
 {
+    // The call below is used to avoid the "unused parameter" warning.
+    // The context itself can be used by cryptographic calls which require it.
+    (void)ctx;
+
     mbedtls_printf("\r\n\r\n");
 
     /*
@@ -157,7 +161,7 @@ int main() {
         return -1;
     }
 
-    int ret = example();
+    int ret = example(&platform_ctx);
     if (ret != 0) {
         mbedtls_printf("Example failed with error %d\r\n", ret);
     }

tls-client/HelloHttpsClient.cpp

@@ -70,10 +70,12 @@ const char *HelloHttpsClient::HTTP_HELLO_STR = "Hello world!";
 const char *HelloHttpsClient::HTTP_OK_STR = "200 OK";
 
 HelloHttpsClient::HelloHttpsClient(const char *in_server_name,
-                                   const uint16_t in_server_port) :
+                                   const uint16_t in_server_port,
+                                   mbedtls_platform_context* in_platform_ctx) :
     socket(),
     server_name(in_server_name),
-    server_port(in_server_port)
+    server_port(in_server_port),
+    platform_ctx(in_platform_ctx)
 {
     mbedtls_entropy_init(&entropy);
     mbedtls_ctr_drbg_init(&ctr_drbg);

tls-client/HelloHttpsClient.h

@@ -25,6 +25,7 @@
 #include "TCPSocket.h"
 
 #include "mbedtls/config.h"
+#include "mbedtls/platform.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
@@ -60,7 +61,8 @@ class HelloHttpsClient
      *              The server port
      */
     HelloHttpsClient(const char *in_server_name,
-                     const uint16_t in_server_port);
+                     const uint16_t in_server_port,
+                     mbedtls_platform_context* in_platform_ctx);
 
     /**
      * Free any allocated resources
@@ -223,6 +225,8 @@ class HelloHttpsClient
      * The TLS configuration in use
      */
     mbedtls_ssl_config ssl_conf;
+
+    mbedtls_platform_context* platform_ctx;
 };
 
 #endif /* _HELLOHTTPSCLIENT_H_ */

tls-client/main.cpp

@@ -71,7 +71,8 @@ int main()
 #endif /* MBEDTLS_MAJOR_VERSION */
 
     /* Allocate a HTTPS client */
-    client = new (std::nothrow) HelloHttpsClient(SERVER_NAME, SERVER_PORT);
+    client = new (std::nothrow) HelloHttpsClient(SERVER_NAME, SERVER_PORT,
+                                                 &platform_ctx);
     if (client == NULL) {
         mbedtls_printf("Failed to allocate HelloHttpsClient object\n"
                        "\nFAIL\n");