From 0345f979622548953527659ad96fe4259470d175 Mon Sep 17 00:00:00 2001
From: MrKevinWeiss <weiss.kevin604@gmail.com>
Date: Tue, 15 Jun 2021 12:01:06 +0200
Subject: [PATCH] pkg/qdsa: force qdsa to lowercase

---
 pkg/Kconfig                         | 2 +-
 pkg/qDSA/Makefile                   | 9 ---------
 pkg/{qDSA => qdsa}/Kconfig          | 0
 pkg/qdsa/Makefile                   | 9 +++++++++
 pkg/{qDSA => qdsa}/Makefile.dep     | 4 ++--
 pkg/{qDSA => qdsa}/Makefile.include | 2 +-
 pkg/{qDSA => qdsa}/doc.txt          | 2 +-
 tests/pkg_qdsa/Makefile             | 2 +-
 tests/pkg_qdsa/app.config.test      | 4 ++++
 9 files changed, 19 insertions(+), 15 deletions(-)
 delete mode 100644 pkg/qDSA/Makefile
 rename pkg/{qDSA => qdsa}/Kconfig (100%)
 create mode 100644 pkg/qdsa/Makefile
 rename pkg/{qDSA => qdsa}/Makefile.dep (78%)
 rename pkg/{qDSA => qdsa}/Makefile.include (89%)
 rename pkg/{qDSA => qdsa}/doc.txt (89%)

diff --git a/pkg/Kconfig b/pkg/Kconfig
index 89a3c50cea..04a9f49996 100644
--- a/pkg/Kconfig
+++ b/pkg/Kconfig
@@ -31,7 +31,7 @@ rsource "monocypher/Kconfig"
 rsource "nanocbor/Kconfig"
 rsource "nanopb/Kconfig"
 rsource "qcbor/Kconfig"
-rsource "qDSA/Kconfig"
+rsource "qdsa/Kconfig"
 rsource "qr-code-generator/Kconfig"
 rsource "relic/Kconfig"
 rsource "semtech-loramac/Kconfig"
diff --git a/pkg/qDSA/Makefile b/pkg/qDSA/Makefile
deleted file mode 100644
index 94485f34e2..0000000000
--- a/pkg/qDSA/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-PKG_NAME=qDSA
-PKG_URL=https://github.com/RIOT-OS/qDSA.git
-PKG_VERSION=dd2392b0c81ce4187fd3e1e2d3e0a4767f75782e
-PKG_LICENSE=PD
-
-include $(RIOTBASE)/pkg/pkg.mk
-
-all:
-	$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/$(QDSA_IMPL)
diff --git a/pkg/qDSA/Kconfig b/pkg/qdsa/Kconfig
similarity index 100%
rename from pkg/qDSA/Kconfig
rename to pkg/qdsa/Kconfig
diff --git a/pkg/qdsa/Makefile b/pkg/qdsa/Makefile
new file mode 100644
index 0000000000..6c4035c4ca
--- /dev/null
+++ b/pkg/qdsa/Makefile
@@ -0,0 +1,9 @@
+PKG_NAME=qdsa
+PKG_URL=https://github.com/RIOT-OS/qdsa.git
+PKG_VERSION=4cb3f1a140f25e18ed288fd484defe3d45bdf166
+PKG_LICENSE=PD
+
+include $(RIOTBASE)/pkg/pkg.mk
+
+all:
+	$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/$(QDSA_IMPL)
diff --git a/pkg/qDSA/Makefile.dep b/pkg/qdsa/Makefile.dep
similarity index 78%
rename from pkg/qDSA/Makefile.dep
rename to pkg/qdsa/Makefile.dep
index 2cedd9b6cc..dbf3943b42 100644
--- a/pkg/qDSA/Makefile.dep
+++ b/pkg/qdsa/Makefile.dep
@@ -1,9 +1,9 @@
 ifneq (,$(filter cortex-m23 cortex-m0%,$(CPU_CORE)))
-  USEMODULE += qDSA_asm
+  USEMODULE += qdsa_asm
 endif
 
 ifneq (,$(filter arch_avr8,$(FEATURES_USED)))
-  USEMODULE += qDSA_asm
+  USEMODULE += qdsa_asm
 endif
 
 # qDsa is not 16 bit compatible
diff --git a/pkg/qDSA/Makefile.include b/pkg/qdsa/Makefile.include
similarity index 89%
rename from pkg/qDSA/Makefile.include
rename to pkg/qdsa/Makefile.include
index 1c113f8d3b..245e84adc3 100644
--- a/pkg/qDSA/Makefile.include
+++ b/pkg/qdsa/Makefile.include
@@ -10,7 +10,7 @@ endif
 
 export QDSA_IMPL
 
-INCLUDES += -I$(PKGDIRBASE)/qDSA/$(QDSA_IMPL)
+INCLUDES += -I$(PKGDIRBASE)/qdsa/$(QDSA_IMPL)
 
 ifeq (cortex-m0plus,$(CPU_CORE))
   # There are problems with the LLVM assembler and the Cortex-M0+ instruction
diff --git a/pkg/qDSA/doc.txt b/pkg/qdsa/doc.txt
similarity index 89%
rename from pkg/qDSA/doc.txt
rename to pkg/qdsa/doc.txt
index 80aa3e63d6..9d99cc8d42 100644
--- a/pkg/qDSA/doc.txt
+++ b/pkg/qdsa/doc.txt
@@ -1,5 +1,5 @@
 /**
- * @defgroup pkg_qDSA   qDSA
+ * @defgroup pkg_qdsa   qdsa
  * @ingroup  pkg
  * @ingroup  sys
  * @brief    Small and Secure Digital Signatures with Curve-based Diffie-Hellman Key Pairs
diff --git a/tests/pkg_qdsa/Makefile b/tests/pkg_qdsa/Makefile
index 7d855c09dc..29a486e486 100644
--- a/tests/pkg_qdsa/Makefile
+++ b/tests/pkg_qdsa/Makefile
@@ -2,7 +2,7 @@ include ../Makefile.tests_common
 
 CFLAGS += -DTHREAD_STACKSIZE_MAIN=\(4*THREAD_STACKSIZE_DEFAULT\)
 
-USEPKG += qDSA
+USEPKG += qdsa
 USEMODULE += random
 USEMODULE += embunit
 
diff --git a/tests/pkg_qdsa/app.config.test b/tests/pkg_qdsa/app.config.test
index f76f62ad49..cd44dc772c 100644
--- a/tests/pkg_qdsa/app.config.test
+++ b/tests/pkg_qdsa/app.config.test
@@ -1,3 +1,7 @@
 CONFIG_MODULE_EMBUNIT=y
 CONFIG_MODULE_RANDOM=y
+# Should be autoselecting the MODULE_PRNG_HWRNG if possible
+# Since the makefile cannot we have to override until end of migration
+# Remove when TEST_KCONFIG is complete
+CONFIG_MODULE_PRNG_TINYMT32=y
 CONFIG_PACKAGE_QDSA=y