Library files moved to use platform layer
diff --git a/library/aes.c b/library/aes.c
index bc4b178..f516fba 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -1,7 +1,7 @@
/*
* FIPS-197 compliant AES implementation
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2014, Brainspark B.V.
*
* This file is part of PolarSSL (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -41,6 +41,12 @@
#include "polarssl/aesni.h"
#endif
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#define polarssl_printf printf
+#endif
+
#if !defined(POLARSSL_AES_ALT)
/*
@@ -1191,8 +1197,8 @@
v = i & 1;
if( verbose != 0 )
- printf( " AES-ECB-%3d (%s): ", 128 + u * 64,
- ( v == AES_DECRYPT ) ? "dec" : "enc" );
+ polarssl_printf( " AES-ECB-%3d (%s): ", 128 + u * 64,
+ ( v == AES_DECRYPT ) ? "dec" : "enc" );
memset( buf, 0, 16 );
@@ -1206,7 +1212,7 @@
if( memcmp( buf, aes_test_ecb_dec[u], 16 ) != 0 )
{
if( verbose != 0 )
- printf( "failed\n" );
+ polarssl_printf( "failed\n" );
return( 1 );
}
@@ -1221,18 +1227,18 @@
if( memcmp( buf, aes_test_ecb_enc[u], 16 ) != 0 )
{
if( verbose != 0 )
- printf( "failed\n" );
+ polarssl_printf( "failed\n" );
return( 1 );
}
}
if( verbose != 0 )
- printf( "passed\n" );
+ polarssl_printf( "passed\n" );
}
if( verbose != 0 )
- printf( "\n" );
+ polarssl_printf( "\n" );
#if defined(POLARSSL_CIPHER_MODE_CBC)
/*
@@ -1244,8 +1250,8 @@
v = i & 1;
if( verbose != 0 )
- printf( " AES-CBC-%3d (%s): ", 128 + u * 64,
- ( v == AES_DECRYPT ) ? "dec" : "enc" );
+ polarssl_printf( " AES-CBC-%3d (%s): ", 128 + u * 64,
+ ( v == AES_DECRYPT ) ? "dec" : "enc" );
memset( iv , 0, 16 );
memset( prv, 0, 16 );
@@ -1261,7 +1267,7 @@
if( memcmp( buf, aes_test_cbc_dec[u], 16 ) != 0 )
{
if( verbose != 0 )
- printf( "failed\n" );
+ polarssl_printf( "failed\n" );
return( 1 );
}
@@ -1284,18 +1290,18 @@
if( memcmp( prv, aes_test_cbc_enc[u], 16 ) != 0 )
{
if( verbose != 0 )
- printf( "failed\n" );
+ polarssl_printf( "failed\n" );
return( 1 );
}
}
if( verbose != 0 )
- printf( "passed\n" );
+ polarssl_printf( "passed\n" );
}
if( verbose != 0 )
- printf( "\n" );
+ polarssl_printf( "\n" );
#endif /* POLARSSL_CIPHER_MODE_CBC */
#if defined(POLARSSL_CIPHER_MODE_CFB)
@@ -1308,8 +1314,8 @@
v = i & 1;
if( verbose != 0 )
- printf( " AES-CFB128-%3d (%s): ", 128 + u * 64,
- ( v == AES_DECRYPT ) ? "dec" : "enc" );
+ polarssl_printf( " AES-CFB128-%3d (%s): ", 128 + u * 64,
+ ( v == AES_DECRYPT ) ? "dec" : "enc" );
memcpy( iv, aes_test_cfb128_iv, 16 );
memcpy( key, aes_test_cfb128_key[u], 16 + u * 8 );
@@ -1325,7 +1331,7 @@
if( memcmp( buf, aes_test_cfb128_pt, 64 ) != 0 )
{
if( verbose != 0 )
- printf( "failed\n" );
+ polarssl_printf( "failed\n" );
return( 1 );
}
@@ -1338,18 +1344,18 @@
if( memcmp( buf, aes_test_cfb128_ct[u], 64 ) != 0 )
{
if( verbose != 0 )
- printf( "failed\n" );
+ polarssl_printf( "failed\n" );
return( 1 );
}
}
if( verbose != 0 )
- printf( "passed\n" );
+ polarssl_printf( "passed\n" );
}
if( verbose != 0 )
- printf( "\n" );
+ polarssl_printf( "\n" );
#endif /* POLARSSL_CIPHER_MODE_CFB */
#if defined(POLARSSL_CIPHER_MODE_CTR)
@@ -1362,8 +1368,8 @@
v = i & 1;
if( verbose != 0 )
- printf( " AES-CTR-128 (%s): ",
- ( v == AES_DECRYPT ) ? "dec" : "enc" );
+ polarssl_printf( " AES-CTR-128 (%s): ",
+ ( v == AES_DECRYPT ) ? "dec" : "enc" );
memcpy( nonce_counter, aes_test_ctr_nonce_counter[u], 16 );
memcpy( key, aes_test_ctr_key[u], 16 );
@@ -1381,7 +1387,7 @@
if( memcmp( buf, aes_test_ctr_pt[u], len ) != 0 )
{
if( verbose != 0 )
- printf( "failed\n" );
+ polarssl_printf( "failed\n" );
return( 1 );
}
@@ -1396,18 +1402,18 @@
if( memcmp( buf, aes_test_ctr_ct[u], len ) != 0 )
{
if( verbose != 0 )
- printf( "failed\n" );
+ polarssl_printf( "failed\n" );
return( 1 );
}
}
if( verbose != 0 )
- printf( "passed\n" );
+ polarssl_printf( "passed\n" );
}
if( verbose != 0 )
- printf( "\n" );
+ polarssl_printf( "\n" );
#endif /* POLARSSL_CIPHER_MODE_CTR */
return( 0 );