commit 69bb3f5332b70739855b2bcf76a9c11085c99806
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Jan 31 13:09:47 2022 +0100
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Jan 31 13:09:47 2022 +0100
tree 60edcfd0dae1cd7f41e9b5435b336d57dd8acaa3
parent 248b385f1b7512292722ed2f10307cc9c131302a

Move hmac_non_psa out of psa/ directory

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>

programs/Makefile

diff --git a/programs/Makefile b/programs/Makefile
index 2f0d406..d2f7d8d 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -64,6 +64,7 @@
 	aes/crypt_and_hash \
 	hash/generic_sum \
 	hash/hello \
+	hash/hmac_demo \
 	pkey/dh_client \
 	pkey/dh_genprime \
 	pkey/dh_server \
@@ -87,8 +88,7 @@
 	psa/aead_non_psa \
 	psa/aead_psa \
 	psa/crypto_examples \
-	psa/hmac_non_psa \
-	psa/hmac_psa \
+	psa/hmac_demo \
 	psa/key_ladder_demo \
 	psa/psa_constant_names \
 	random/gen_entropy \
@@ -177,13 +177,17 @@
 	echo "  CC    aes/crypt_and_hash.c"
 	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) aes/crypt_and_hash.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
 
+hash/generic_sum$(EXEXT): hash/generic_sum.c $(DEP)
+	echo "  CC    hash/generic_sum.c"
+	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) hash/generic_sum.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
+
 hash/hello$(EXEXT): hash/hello.c $(DEP)
 	echo "  CC    hash/hello.c"
 	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) hash/hello.c       $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
 
-hash/generic_sum$(EXEXT): hash/generic_sum.c $(DEP)
-	echo "  CC    hash/generic_sum.c"
-	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) hash/generic_sum.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
+hash/hmac_demo$(EXEXT): hash/hmac_demo.c $(DEP)
+	echo "  CC    hash/hmac_demo.c"
+	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) hash/hmac_demo.c    $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
 
 pkey/dh_client$(EXEXT): pkey/dh_client.c $(DEP)
 	echo "  CC    pkey/dh_client.c"
@@ -277,13 +281,9 @@
 	echo "  CC    psa/crypto_examples.c"
 	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) psa/crypto_examples.c    $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
 
-psa/hmac_non_psa$(EXEXT): psa/hmac_non_psa.c $(DEP)
-	echo "  CC    psa/hmac_non_psa.c"
-	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) psa/hmac_non_psa.c    $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
-
-psa/hmac_psa$(EXEXT): psa/hmac_psa.c $(DEP)
-	echo "  CC    psa/hmac_psa.c"
-	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) psa/hmac_psa.c    $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
+psa/hmac_demo$(EXEXT): psa/hmac_demo.c $(DEP)
+	echo "  CC    psa/hmac_demo.c"
+	$(CC) $(LOCAL_CFLAGS) $(CFLAGS) psa/hmac_demo.c    $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
 
 psa/key_ladder_demo$(EXEXT): psa/key_ladder_demo.c $(DEP)
 	echo "  CC    psa/key_ladder_demo.c"