yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid duplicate program names

Browse source 
Visual Studio and CMake didn't like having targets with the same name,
albeit in different directories.

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
This commit is contained in:
Manuel Pégourié-Gonnard 2022-02-01 09:38:26 +01:00
parent 6fdc9e8df1
commit 29088a4146
8 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
programs/.gitignore vendored
View file

@ -13,10 +13,10 @@
*.exe *.exe
aes/crypt_and_hash aes/crypt_and_hash
cipher/aead_demo cipher/cipher_aead_demo
hash/generic_sum hash/generic_sum
hash/hello hash/hello
hash/hmac_demo hash/md_hmac_demo
hash/md5sum hash/md5sum
hash/sha1sum hash/sha1sum
hash/sha2sum hash/sha2sum

16
programs/Makefile
View file

@ -62,10 +62,10 @@ endif
## make sure to check that it still works if you tweak the format here. ## make sure to check that it still works if you tweak the format here.
APPS = \ APPS = \
aes/crypt_and_hash \ aes/crypt_and_hash \
cipher/aead_demo \ cipher/cipher_aead_demo \
hash/generic_sum \ hash/generic_sum \
hash/hello \ hash/hello \
hash/hmac_demo \ hash/md_hmac_demo \
pkey/dh_client \ pkey/dh_client \
pkey/dh_genprime \ pkey/dh_genprime \
pkey/dh_server \ pkey/dh_server \
@ -177,9 +177,9 @@ aes/crypt_and_hash$(EXEXT): aes/crypt_and_hash.c $(DEP)
echo " CC aes/crypt_and_hash.c" echo " CC aes/crypt_and_hash.c"
$(CC) $(LOCAL_CFLAGS) $(CFLAGS) aes/crypt_and_hash.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(CC) $(LOCAL_CFLAGS) $(CFLAGS) aes/crypt_and_hash.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
cipher/aead_demo$(EXEXT): cipher/aead_demo.c $(DEP) cipher/cipher_aead_demo$(EXEXT): cipher/cipher_aead_demo.c $(DEP)
echo " CC cipher/aead_demo.c" echo " CC cipher/cipher_aead_demo.c"
$(CC) $(LOCAL_CFLAGS) $(CFLAGS) cipher/aead_demo.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(CC) $(LOCAL_CFLAGS) $(CFLAGS) cipher/cipher_aead_demo.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
hash/generic_sum$(EXEXT): hash/generic_sum.c $(DEP) hash/generic_sum$(EXEXT): hash/generic_sum.c $(DEP)
echo " CC hash/generic_sum.c" echo " CC hash/generic_sum.c"
@ -189,9 +189,9 @@ hash/hello$(EXEXT): hash/hello.c $(DEP)
echo " CC hash/hello.c" echo " CC hash/hello.c"
$(CC) $(LOCAL_CFLAGS) $(CFLAGS) hash/hello.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(CC) $(LOCAL_CFLAGS) $(CFLAGS) hash/hello.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
hash/hmac_demo$(EXEXT): hash/hmac_demo.c $(DEP) hash/md_hmac_demo$(EXEXT): hash/md_hmac_demo.c $(DEP)
echo " CC hash/hmac_demo.c" echo " CC hash/md_hmac_demo.c"
$(CC) $(LOCAL_CFLAGS) $(CFLAGS) hash/hmac_demo.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(CC) $(LOCAL_CFLAGS) $(CFLAGS) hash/md_hmac_demo.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
pkey/dh_client$(EXEXT): pkey/dh_client.c $(DEP) pkey/dh_client$(EXEXT): pkey/dh_client.c $(DEP)
echo " CC pkey/dh_client.c" echo " CC pkey/dh_client.c"

2
programs/cipher/CMakeLists.txt
View file

@ -1,5 +1,5 @@
set(executables set(executables
aead_demo cipher_aead_demo
) )
foreach(exe IN LISTS executables) foreach(exe IN LISTS executables)

2
programs/cipher/aead_demo.c → programs/cipher/cipher_aead_demo.c
View file

@ -66,7 +66,7 @@ int main( void )
/* The real program starts here. */ /* The real program starts here. */
const char usage[] = "Usage: aead_demo [aes128-gcm|aes256-gcm|aes128-gcm_8|chachapoly]"; const char usage[] = "Usage: cipher_aead_demo [aes128-gcm|aes256-gcm|aes128-gcm_8|chachapoly]";
/* Dummy data for encryption: IV/nonce, additional data, 2-part message */ /* Dummy data for encryption: IV/nonce, additional data, 2-part message */
const unsigned char iv1[12] = { 0x00 }; const unsigned char iv1[12] = { 0x00 };

2
programs/hash/CMakeLists.txt
View file

@ -1,7 +1,7 @@
set(executables set(executables
generic_sum generic_sum
hello hello
hmac_demo md_hmac_demo
) )
foreach(exe IN LISTS executables) foreach(exe IN LISTS executables)

0
programs/hash/hmac_demo.c → programs/hash/md_hmac_demo.c
View file

4
programs/psa/aead_demo.c
View file

@ -4,7 +4,7 @@
* This program AEAD-encrypts a message, using the algorithm and key size * This program AEAD-encrypts a message, using the algorithm and key size
* specified on the command line, using the multi-part API. * specified on the command line, using the multi-part API.
* *
* It comes with a companion program cipher/aead_demo.c, which does the same * It comes with a companion program cipher/cipher_aead_demo.c, which does the same
* operations with the legacy Cipher API. The goal is that comparing the two * operations with the legacy Cipher API. The goal is that comparing the two
* programs will help people migrating to the PSA Crypto API. * programs will help people migrating to the PSA Crypto API.
* *
@ -18,7 +18,7 @@
* On the other hand, with PSA, the algorithms encodes the desired tag length; * On the other hand, with PSA, the algorithms encodes the desired tag length;
* with Cipher the desired tag length needs to be tracked separately. * with Cipher the desired tag length needs to be tracked separately.
* *
* This program and its companion cipher/aead_demo.c illustrate this by doing the * This program and its companion cipher/cipher_aead_demo.c illustrate this by doing the
* same sequence of multi-part AEAD computation with both APIs; looking at the * same sequence of multi-part AEAD computation with both APIs; looking at the
* two side by side should make the differences and similarities clear. * two side by side should make the differences and similarities clear.
*/ */

4
programs/psa/hmac_demo.c
View file

@ -3,7 +3,7 @@
* *
* This programs computes the HMAC of two messages using the multi-part API. * This programs computes the HMAC of two messages using the multi-part API.
* *
* It comes with a companion program hash/hmac_demo.c, which does the same * It comes with a companion program hash/md_hmac_demo.c, which does the same
* operations with the legacy MD API. The goal is that comparing the two * operations with the legacy MD API. The goal is that comparing the two
* programs will help people migrating to the PSA Crypto API. * programs will help people migrating to the PSA Crypto API.
* *
@ -13,7 +13,7 @@
* objects: (1) a psa_key_id_t to hold the key, and (2) a psa_operation_t for * objects: (1) a psa_key_id_t to hold the key, and (2) a psa_operation_t for
* multi-part progress. * multi-part progress.
* *
* This program and its companion hash/hmac_demo.c illustrate this by doing the * This program and its companion hash/md_hmac_demo.c illustrate this by doing the
* same sequence of multi-part HMAC computation with both APIs; looking at the * same sequence of multi-part HMAC computation with both APIs; looking at the
* two side by side should make the differences and similarities clear. * two side by side should make the differences and similarities clear.
*/ */