mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-24 17:05:32 +00:00
Merge pull request #233 from ARMmbed/psa-fix_all.sh-20181204
Fix all.sh
This commit is contained in:
commit
de14d4d86d
|
@ -147,12 +147,10 @@ static int key_type_is_raw_bytes( psa_key_type_t type )
|
|||
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 @@ typedef struct
|
|||
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;
|
||||
|
||||
|
|
|
@ -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 @@ static int fake_entropy_source( void *state_arg,
|
|||
output[i] = i;
|
||||
++state->step;
|
||||
return( 0 );
|
||||
};
|
||||
}
|
||||
|
||||
#define ENTROPY_SOURCE_PLATFORM 0x00000001
|
||||
#define ENTROPY_SOURCE_TIMING 0x00000002
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue