yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-25 05:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Fix all.sh
This commit is contained in:
Gilles Peskine 2018-12-05 09:36:52 +01:00 committed by GitHub
parent 9edc146237 5a3c50e890
commit de14d4d86d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
library/psa_crypto.c
View file

@ -147,12 +147,10 @@ static int key_type_is_raw_bytes( psa_key_type_t type )
return( PSA_KEY_TYPE_IS_UNSTRUCTURED( type ) ); return( PSA_KEY_TYPE_IS_UNSTRUCTURED( type ) );
} }
enum rng_state /* Values for psa_global_data_t::rng_state */
{ #define RNG_NOT_INITIALIZED 0
RNG_NOT_INITIALIZED = 0, #define RNG_INITIALIZED 1
RNG_INITIALIZED, #define RNG_SEEDED 2
RNG_SEEDED,
};
typedef struct typedef struct
{ {
@ -162,7 +160,7 @@ typedef struct
mbedtls_ctr_drbg_context ctr_drbg; mbedtls_ctr_drbg_context ctr_drbg;
key_slot_t key_slots[PSA_KEY_SLOT_COUNT]; key_slot_t key_slots[PSA_KEY_SLOT_COUNT];
unsigned initialized : 1; unsigned initialized : 1;
enum rng_state rng_state : 2; unsigned rng_state : 2;
unsigned key_slots_initialized : 1; unsigned key_slots_initialized : 1;
} psa_global_data_t; } psa_global_data_t;

3
tests/suites/test_suite_psa_crypto_init.function
View file

@ -11,7 +11,6 @@
#include "mbedtls/entropy.h" #include "mbedtls/entropy.h"
#include "mbedtls/entropy_poll.h" #include "mbedtls/entropy_poll.h"
#include "mbedtls/platform.h"
#define MIN( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) ) #define MIN( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) )
#define MAX( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) ) #define MAX( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )
@ -41,7 +40,7 @@ static int fake_entropy_source( void *state_arg,
output[i] = i; output[i] = i;
++state->step; ++state->step;
return( 0 ); return( 0 );
}; }
#define ENTROPY_SOURCE_PLATFORM 0x00000001 #define ENTROPY_SOURCE_PLATFORM 0x00000001
#define ENTROPY_SOURCE_TIMING 0x00000002 #define ENTROPY_SOURCE_TIMING 0x00000002

1
visualc/VS2010/mbedTLS.vcxproj
View file

@ -231,6 +231,7 @@
<ClInclude Include="..\..\include\psa\crypto_platform.h" /> <ClInclude Include="..\..\include\psa\crypto_platform.h" />
<ClInclude Include="..\..\include\psa\crypto_sizes.h" /> <ClInclude Include="..\..\include\psa\crypto_sizes.h" />
<ClInclude Include="..\..\include\psa\crypto_struct.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.h" />
<ClInclude Include="..\..\library/psa_crypto_storage_backend.h" /> <ClInclude Include="..\..\library/psa_crypto_storage_backend.h" />
</ItemGroup> </ItemGroup>