From 3cdac6d95c5b33d5a9949d016f83dd1cc6b685bd Mon Sep 17 00:00:00 2001
From: wangyu- <wangyucn@gmail.com>
Date: Mon, 18 Sep 2017 04:01:25 -0500
Subject: [PATCH] modify aes from polarssl

---
 lib/aes_c/aes.c | 12 ++++++++----
 lib/aes_c/aes.h | 12 +++++++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/lib/aes_c/aes.c b/lib/aes_c/aes.c
index f295747..bf0c700 100644
--- a/lib/aes_c/aes.c
+++ b/lib/aes_c/aes.c
@@ -29,15 +29,18 @@
  *  http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
  */
 
+/*
 #if !defined(POLARSSL_CONFIG_FILE)
 #include "polarssl/config.h"
 #else
 #include POLARSSL_CONFIG_FILE
 #endif
+*/
+//#if defined(POLARSSL_AES_C)
 
-#if defined(POLARSSL_AES_C)
 
-#include "polarssl/aes.h"
+#include "aes.h"
+/*
 #if defined(POLARSSL_PADLOCK_C)
 #include "polarssl/padlock.h"
 #endif
@@ -50,12 +53,13 @@
 #else
 #define polarssl_printf printf
 #endif
+*/
 
 #if !defined(POLARSSL_AES_ALT)
 
 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
-    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
+    volatile unsigned char *p = (unsigned char *)v; while( n-- ) *p++ = 0;
 }
 
 /*
@@ -1451,4 +1455,4 @@ exit:
 
 #endif /* POLARSSL_SELF_TEST */
 
-#endif /* POLARSSL_AES_C */
+//#endif /* POLARSSL_AES_C */
diff --git a/lib/aes_c/aes.h b/lib/aes_c/aes.h
index 2e9092f..0cb6cce 100644
--- a/lib/aes_c/aes.h
+++ b/lib/aes_c/aes.h
@@ -26,12 +26,22 @@
  */
 #ifndef POLARSSL_AES_H
 #define POLARSSL_AES_H
-
+/*
 #if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
 #else
 #include POLARSSL_CONFIG_FILE
 #endif
+*/
+
+////////modification begin
+#define POLARSSL_AES_ROM_TABLES
+#define POLARSSL_CIPHER_MODE_CBC
+#define POLARSSL_SELF_TEST
+#define polarssl_printf printf
+///////add end
+
+
 
 #include <string.h>