riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkg/tinydtls: enforce the selection of a crypto secure PRNG

Browse Source 
Also add a sanity checks on the prng_ modules.
This commit is contained in:
Leandro Lanzieri 2020-08-14 17:24:39 +02:00
parent 613d0cfffd
commit 531367a9a2
No known key found for this signature in database
GPG Key ID: 13559905E2EBEAA5
8 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dtls-echo/Makefile
View File

@ -20,6 +20,8 @@ USEMODULE += shell
USEMODULE += shell_commands USEMODULE += shell_commands
USEPKG += tinydtls USEPKG += tinydtls
# tinydtls needs crypto secure PRNG
USEMODULE += prng_sha1prng
# UDP Port to use (20220 is default for DTLS). # UDP Port to use (20220 is default for DTLS).
DTLS_PORT ?= 20220 DTLS_PORT ?= 20220

3
examples/dtls-sock/Makefile
View File

@ -21,6 +21,9 @@ USEMODULE += gnrc_sock_udp
# Use tinydtls for sock_dtls # Use tinydtls for sock_dtls
USEMODULE += tinydtls_sock_dtls USEMODULE += tinydtls_sock_dtls
# tinydtls needs crypto secure PRNG
USEMODULE += prng_sha1prng
# Add also the shell, some shell commands # Add also the shell, some shell commands
USEMODULE += shell USEMODULE += shell
USEMODULE += shell_commands USEMODULE += shell_commands

4
pkg/tinydtls/Makefile.dep
View File

@ -6,9 +6,5 @@ USEMODULE += random
USEMODULE += tinydtls_aes USEMODULE += tinydtls_aes
USEMODULE += tinydtls_ecc USEMODULE += tinydtls_ecc
# tinydtls needs cryptographically secure randomness
# TODO: restore configurability, e.g. allow to use HWRNG instead if available
USEMODULE += prng_sha1prng
# TinyDTLS only has support for 32-bit architectures ATM # TinyDTLS only has support for 32-bit architectures ATM
FEATURES_REQUIRED += arch_32bit FEATURES_REQUIRED += arch_32bit

9
pkg/tinydtls/Makefile.include
View File

@ -11,6 +11,15 @@ INCLUDES += -I$(PKG_BUILDDIR)
# Mandatory for tinyDTLS # Mandatory for tinyDTLS
CFLAGS += -DDTLSv12 -DWITH_SHA256 CFLAGS += -DDTLSv12 -DWITH_SHA256
# Check that the used PRNG implementation is cryptographically secure
CRYPTO_SECURE_IMPLEMENTATIONS := prng_sha256prng prng_sha1prng prng_hwrng
USED_PRNG_IMPLEMENTATIONS := $(filter prng_%,$(USEMODULE))
ifeq (,$(filter $(CRYPTO_SECURE_IMPLEMENTATIONS),$(USEMODULE)))
$(info TinyDTLS needs a cryptographically secure implementation of the PRNG module.)
$(info Currently using: $(USED_PRNG_IMPLEMENTATIONS))
$(error Please use one of: $(CRYPTO_SECURE_IMPLEMENTATIONS))
endif
# Dependencies partially under control of the App's requirements # Dependencies partially under control of the App's requirements
# The configuration for socket overrides Sock # The configuration for socket overrides Sock

2
pkg/tinydtls/doc.txt
View File

@ -12,6 +12,8 @@
* *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {.mk} * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {.mk}
* USEPKG += tinydtls * USEPKG += tinydtls
* # a cryptographically secure implementation of PRNG is needed
* USEMODULE += prng_sha1prng
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* *
* Supported Cipher Suites * Supported Cipher Suites

4
sys/Makefile.include
View File

@ -117,3 +117,7 @@ endif
ifneq (,$(filter ztimer_xtimer_compat,$(USEMODULE))) ifneq (,$(filter ztimer_xtimer_compat,$(USEMODULE)))
PSEUDOMODULES += xtimer PSEUDOMODULES += xtimer
endif endif
ifneq (,$(filter prng,$(USEMODULE)))
include $(RIOTBASE)/sys/random/Makefile.include
endif

15
sys/random/Makefile.include Normal file
View File

@ -0,0 +1,15 @@
USED_PRNG_IMPLEMENTATIONS := $(filter prng_%,$(USEMODULE))
# Check that prng_shaxprng is not used by itself
ifneq (,$(filter prng_shaxprng,$(USEMODULE)))
ifeq (,$(filter prng_sha1prng prng_sha256prng,$(USEMODULE)))
$(error prng_shaxprng should not be used directly. Select one of: prng_sha1prng, prng_sha256prng)
endif
endif
# Check that only one implementation of PRNG is used
# NOTE: prng_shaxprng is filtered out because it is used by the specific implementations
ifneq (1,$(words $(filter-out prng_shaxprng,$(USED_PRNG_IMPLEMENTATIONS))))
$(info Currently the following prng modules are used: $(USED_PRNG_IMPLEMENTATIONS))
$(error Only one implementation of PRNG should be used.)
endif

2
tests/pkg_tinydtls_sock_async/Makefile
View File

@ -17,6 +17,8 @@ USEMODULE += event_timeout
# Use tinydtls for sock_dtls # Use tinydtls for sock_dtls
USEMODULE += tinydtls_sock_dtls USEMODULE += tinydtls_sock_dtls
# tinydtls needs crypto secure PRNG
USEMODULE += prng_sha1prng
# Add also the shell, some shell commands # Add also the shell, some shell commands
USEMODULE += shell USEMODULE += shell