yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 16:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename psa_helpers.function to psa_crypto_helpers.h

Browse source 
This file isn't like the other .function files: it isn't concatenated
by a separate preprocessing script, but included via C preprocessing.

Rename this file to .h. This isn't a normal C header, because it
defines auxiliary functions. But the functions aren't big and we only
have one compilation unit per executable, so this is good enough for
what we're doing.
This commit is contained in:
Gilles Peskine 2019-06-20 12:40:56 +02:00
parent 982fe790c1
commit 1838e82190
9 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/Makefile
View file

@ -104,7 +104,7 @@ $(BINARIES): %$(EXEXT): %.c $(DEP)
echo " CC $<" echo " CC $<"
$(CC) $(LOCAL_CFLAGS) $(CFLAGS) $< $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(CC) $(LOCAL_CFLAGS) $(CFLAGS) $< $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
$(filter test_suite_psa_crypto%, $(BINARIES)): psa_helpers.function $(filter test_suite_psa_crypto%, $(BINARIES)): psa_crypto_helpers.h
clean: clean:
ifndef WINDOWS ifndef WINDOWS

9
tests/psa_helpers.function → tests/psa_crypto_helpers.h
View file

@ -19,6 +19,9 @@
* This file is part of mbed TLS (https://tls.mbed.org) * This file is part of mbed TLS (https://tls.mbed.org)
*/ */
#ifndef PSA_CRYPTO_HELPERS_H
#define PSA_CRYPTO_HELPERS_H
#if defined(MBEDTLS_PSA_CRYPTO_SPM) #if defined(MBEDTLS_PSA_CRYPTO_SPM)
#include "spm/psa_defs.h" #include "spm/psa_defs.h"
#endif #endif
@ -78,8 +81,4 @@ static void test_helper_psa_done( int line, const char *file )
*/ */
#define PSA_DONE( ) test_helper_psa_done( __LINE__, __FILE__ ) #define PSA_DONE( ) test_helper_psa_done( __LINE__, __FILE__ )
/* #endif /* PSA_CRYPTO_HELPERS_H */
* Local Variables:
* mode: c
* End:
*/

2
tests/suites/test_suite_pk.function
View file

@ -12,7 +12,7 @@
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
#include "mbedtls/psa_util.h" #include "mbedtls/psa_util.h"
#include "psa_helpers.function" #include "psa_crypto_helpers.h"
#endif #endif
static int rnd_std_rand( void *rng_state, unsigned char *output, size_t len ); static int rnd_std_rand( void *rng_state, unsigned char *output, size_t len );

2
tests/suites/test_suite_psa_crypto.function
View file

@ -5,7 +5,7 @@
#include "mbedtls/asn1write.h" #include "mbedtls/asn1write.h"
#include "mbedtls/oid.h" #include "mbedtls/oid.h"
#include "psa_helpers.function" #include "psa_crypto_helpers.h"
/** An invalid export length that will never be set by psa_export_key(). */ /** An invalid export length that will never be set by psa_export_key(). */
static const size_t INVALID_EXPORT_LENGTH = ~0U; static const size_t INVALID_EXPORT_LENGTH = ~0U;

2
tests/suites/test_suite_psa_crypto_entropy.function
View file

@ -4,7 +4,7 @@
#include "mbedtls/entropy.h" #include "mbedtls/entropy.h"
#include "mbedtls/entropy_poll.h" #include "mbedtls/entropy_poll.h"
#include "psa_helpers.function" #include "psa_crypto_helpers.h"
#if defined(MBEDTLS_PSA_ITS_FILE_C) #if defined(MBEDTLS_PSA_ITS_FILE_C)
#include <stdio.h> #include <stdio.h>
#else #else

2
tests/suites/test_suite_psa_crypto_hash.function
View file

@ -2,7 +2,7 @@
#include <stdint.h> #include <stdint.h>
#include "psa_helpers.function" #include "psa_crypto_helpers.h"
/* END_HEADER */ /* END_HEADER */

2
tests/suites/test_suite_psa_crypto_init.function
View file

@ -1,7 +1,7 @@
/* BEGIN_HEADER */ /* BEGIN_HEADER */
#include <stdint.h> #include <stdint.h>
#include "psa_helpers.function" #include "psa_crypto_helpers.h"
/* Some tests in this module configure entropy sources. */ /* Some tests in this module configure entropy sources. */
#include "psa_crypto_invasive.h" #include "psa_crypto_invasive.h"

2
tests/suites/test_suite_psa_crypto_persistent_key.function
View file

@ -1,7 +1,7 @@
/* BEGIN_HEADER */ /* BEGIN_HEADER */
#include <stdint.h> #include <stdint.h>
#include "psa_helpers.function" #include "psa_crypto_helpers.h"
#include "psa_crypto_storage.h" #include "psa_crypto_storage.h"
#include "mbedtls/md.h" #include "mbedtls/md.h"

2
tests/suites/test_suite_psa_crypto_slot_management.function
View file

@ -1,7 +1,7 @@
/* BEGIN_HEADER */ /* BEGIN_HEADER */
#include <stdint.h> #include <stdint.h>
#include "psa_helpers.function" #include "psa_crypto_helpers.h"
#include "psa_crypto_storage.h" #include "psa_crypto_storage.h"
typedef enum typedef enum