commit d9ca94a677ddfe77c39aa281875164ae437fa463
author Paul Bakker <p.j.bakker@polarssl.org> Thu Jul 25 11:25:09 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Thu Jul 25 11:25:09 2013 +0200
tree 289d70ee750653542e497f2a8d857d11f123b4ef
parent dbd79ca61719b81dd540760fd11203cc85e0a3b0

Updated merged pk.c and x509parse.c changes with new memory allocation functions

library/pk.c

diff --git a/library/pk.c b/library/pk.c
index 78ff5e9..3755fbc 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -37,6 +37,13 @@
 #include "polarssl/ecdsa.h"
 #endif
 
+#if defined(POLARSSL_MEMORY_C)
+#include "polarssl/memory.h"
+#else
+#define polarssl_malloc     malloc
+#define polarssl_free       free
+#endif
+
 #include <stdlib.h>
 
 /*
@@ -80,7 +87,7 @@
     }
 
     if( ! ctx->dont_free )
-        free( ctx->data );
+        polarssl_free( ctx->data );
 
     ctx->type = POLARSSL_PK_NONE;
     ctx->data = NULL;
@@ -116,7 +123,7 @@
 #endif
         return( POLARSSL_ERR_PK_TYPE_MISMATCH );
 
-    if( ( ctx->data = malloc( size ) ) == NULL )
+    if( ( ctx->data = polarssl_malloc( size ) ) == NULL )
         return( POLARSSL_ERR_PK_MALLOC_FAILED );
 
     memset( ctx->data, 0, size );