From d1ce014a888b3c09c4ba584c1c609677fb9ebdd2 Mon Sep 17 00:00:00 2001 From: andrekir Date: Sat, 6 May 2023 08:18:56 -0300 Subject: [PATCH] fix: allow empty (no crypto) and 128 bit PSKs --- .../geeksville/mesh/ui/components/config/EditChannelDialog.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt index 4f785d48d..25dffe42a 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt @@ -90,9 +90,9 @@ fun EditChannelDialog( value = pskString, onValueChange = { try { - pskString = it + pskString = it // empty (no crypto), 128 or 256 bit only val decoded = Base64.decode(it, base64Flags).toByteString() - if (decoded.size() == 32) pskInput = decoded // 256 bit only + if (decoded.size() in setOf(0, 16, 32)) pskInput = decoded } catch (ex: Throwable) { // Base64 decode failed, pskError true }