commit de14d4d86d99c82756a133859d424959eb01c578
author Gilles Peskine <gilles.peskine@arm.com> Wed Dec 05 09:36:52 2018 +0100
committer GitHub <noreply@github.com> Wed Dec 05 09:36:52 2018 +0100
tree c3f7fe505a0932ea008313214b2cad66b03d5d88
parent 9edc1462378c6e1056a97205432200cd1ae0ce3d
parent 5a3c50e89049b4a5efbeceea49318182fac28456

Merge pull request #233 from ARMmbed/psa-fix_all.sh-20181204

Fix all.sh

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 233a19e..7415a9a 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -147,12 +147,10 @@
     return( PSA_KEY_TYPE_IS_UNSTRUCTURED( type ) );
 }
 
-enum rng_state
-{
-    RNG_NOT_INITIALIZED = 0,
-    RNG_INITIALIZED,
-    RNG_SEEDED,
-};
+/* Values for psa_global_data_t::rng_state */
+#define RNG_NOT_INITIALIZED 0
+#define RNG_INITIALIZED 1
+#define RNG_SEEDED 2
 
 typedef struct
 {
@@ -162,7 +160,7 @@
     mbedtls_ctr_drbg_context ctr_drbg;
     key_slot_t key_slots[PSA_KEY_SLOT_COUNT];
     unsigned initialized : 1;
-    enum rng_state rng_state : 2;
+    unsigned rng_state : 2;
     unsigned key_slots_initialized : 1;
 } psa_global_data_t;
 

tests/suites/test_suite_psa_crypto_init.function

diff --git a/tests/suites/test_suite_psa_crypto_init.function b/tests/suites/test_suite_psa_crypto_init.function
index 3596504..132fe82 100644
--- a/tests/suites/test_suite_psa_crypto_init.function
+++ b/tests/suites/test_suite_psa_crypto_init.function
@@ -11,7 +11,6 @@
 
 #include "mbedtls/entropy.h"
 #include "mbedtls/entropy_poll.h"
-#include "mbedtls/platform.h"
 
 #define MIN( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) )
 #define MAX( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )
@@ -41,7 +40,7 @@
         output[i] = i;
     ++state->step;
     return( 0 );
-};
+}
 
 #define ENTROPY_SOURCE_PLATFORM                 0x00000001
 #define ENTROPY_SOURCE_TIMING                   0x00000002

visualc/VS2010/mbedTLS.vcxproj

diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj
index 6535d48..d305c45 100644
--- a/visualc/VS2010/mbedTLS.vcxproj
+++ b/visualc/VS2010/mbedTLS.vcxproj
@@ -231,6 +231,7 @@
     <ClInclude Include="..\..\include\psa\crypto_platform.h" />

     <ClInclude Include="..\..\include\psa\crypto_sizes.h" />

     <ClInclude Include="..\..\include\psa\crypto_struct.h" />

+    <ClInclude Include="..\..\library/psa_crypto_invasive.h" />

     <ClInclude Include="..\..\library/psa_crypto_storage.h" />

     <ClInclude Include="..\..\library/psa_crypto_storage_backend.h" />

   </ItemGroup>