diff options
| -rw-r--r-- | library/aes.c | 2 | ||||
| -rw-r--r-- | library/aesni.c | 2 | ||||
| -rw-r--r-- | library/aesni.h (renamed from include/mbedtls/aesni.h) | 0 | ||||
| -rw-r--r-- | library/gcm.c | 2 | ||||
| -rw-r--r-- | programs/test/cpp_dummy_build.cpp | 1 | ||||
| -rw-r--r-- | programs/test/query_config.c | 2 | ||||
| -rw-r--r-- | scripts/data_files/query_config.fmt | 2 | ||||
| -rw-r--r-- | visualc/VS2010/mbedTLS.vcxproj | 2 |
8 files changed, 4 insertions, 9 deletions
diff --git a/library/aes.c b/library/aes.c index 3f61642..5201aed 100644 --- a/library/aes.c +++ b/library/aes.c @@ -37,7 +37,7 @@ #include "mbedtls/padlock.h" #endif #if defined(MBEDTLS_AESNI_C) -#include "mbedtls/aesni.h" +#include "aesni.h" #endif #if defined(MBEDTLS_SELF_TEST) diff --git a/library/aesni.c b/library/aesni.c index 996292f..be226c9 100644 --- a/library/aesni.c +++ b/library/aesni.c @@ -32,7 +32,7 @@ #endif #endif -#include "mbedtls/aesni.h" +#include "aesni.h" #include <string.h> diff --git a/include/mbedtls/aesni.h b/library/aesni.h index c1d22f5..c1d22f5 100644 --- a/include/mbedtls/aesni.h +++ b/library/aesni.h diff --git a/library/gcm.c b/library/gcm.c index 2363e58..d2d2eca 100644 --- a/library/gcm.c +++ b/library/gcm.c @@ -38,7 +38,7 @@ #include <string.h> #if defined(MBEDTLS_AESNI_C) -#include "mbedtls/aesni.h" +#include "aesni.h" #endif #if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C) diff --git a/programs/test/cpp_dummy_build.cpp b/programs/test/cpp_dummy_build.cpp index c2fdf50..ae69194 100644 --- a/programs/test/cpp_dummy_build.cpp +++ b/programs/test/cpp_dummy_build.cpp @@ -25,7 +25,6 @@ #endif #include "mbedtls/aes.h" -#include "mbedtls/aesni.h" #include "mbedtls/arc4.h" #include "mbedtls/aria.h" #include "mbedtls/asn1.h" diff --git a/programs/test/query_config.c b/programs/test/query_config.c index 93bca4b..395763e 100644 --- a/programs/test/query_config.c +++ b/programs/test/query_config.c @@ -37,7 +37,6 @@ * default value when that configuration is not set in the config.h. */ #include "mbedtls/aes.h" -#include "mbedtls/aesni.h" #include "mbedtls/arc4.h" #include "mbedtls/aria.h" #include "mbedtls/asn1.h" @@ -101,7 +100,6 @@ #include "mbedtls/x509_crt.h" #include "mbedtls/x509_csr.h" #include "mbedtls/xtea.h" -#include "../../library/ssl_misc.h" #include <string.h> diff --git a/scripts/data_files/query_config.fmt b/scripts/data_files/query_config.fmt index ef8f717..ed10608 100644 --- a/scripts/data_files/query_config.fmt +++ b/scripts/data_files/query_config.fmt @@ -37,7 +37,6 @@ * default value when that configuration is not set in the config.h. */ #include "mbedtls/aes.h" -#include "mbedtls/aesni.h" #include "mbedtls/arc4.h" #include "mbedtls/aria.h" #include "mbedtls/asn1.h" @@ -101,7 +100,6 @@ #include "mbedtls/x509_crt.h" #include "mbedtls/x509_csr.h" #include "mbedtls/xtea.h" -#include "../../library/ssl_misc.h" #include <string.h> diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj index 8313c11..794150d 100644 --- a/visualc/VS2010/mbedTLS.vcxproj +++ b/visualc/VS2010/mbedTLS.vcxproj @@ -142,7 +142,6 @@ </ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\include\mbedtls\aes.h" />
- <ClInclude Include="..\..\include\mbedtls\aesni.h" />
<ClInclude Include="..\..\include\mbedtls\arc4.h" />
<ClInclude Include="..\..\include\mbedtls\aria.h" />
<ClInclude Include="..\..\include\mbedtls\asn1.h" />
@@ -234,6 +233,7 @@ <ClInclude Include="..\..\tests\include\test\drivers\signature.h" />
<ClInclude Include="..\..\tests\include\test\drivers\size.h" />
<ClInclude Include="..\..\tests\include\test\drivers\test_driver.h" />
+ <ClInclude Include="..\..\library\aesni.h" />
<ClInclude Include="..\..\library\bn_mul.h" />
<ClInclude Include="..\..\library\check_crypto_config.h" />
<ClInclude Include="..\..\library\cipher_wrap.h" />
|