Rename psa_helpers.function to psa_crypto_helpers.h

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

View File

@ -104,7 +104,7 @@ $(BINARIES): %$(EXEXT): %.c $(DEP)
echo " CC $<"
$(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:
ifndef WINDOWS

View File

@ -19,6 +19,9 @@
* 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)
#include "spm/psa_defs.h"
#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__ )
/*
* Local Variables:
* mode: c
* End:
*/
#endif /* PSA_CRYPTO_HELPERS_H */

View File

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

View File

@ -5,7 +5,7 @@
#include "mbedtls/asn1write.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(). */
static const size_t INVALID_EXPORT_LENGTH = ~0U;

View File

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

View File

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

View File

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

View File

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

View File

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