From d4d9be9f0cd68d42837096cf5a23290d9a8ad577 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 9 May 2019 10:49:30 +1000 Subject: [PATCH] Fix public key validation --- SignalServiceKit/src/Loki/ECKeyPair.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/src/Loki/ECKeyPair.swift b/SignalServiceKit/src/Loki/ECKeyPair.swift index c9ed0453e..7f088d866 100644 --- a/SignalServiceKit/src/Loki/ECKeyPair.swift +++ b/SignalServiceKit/src/Loki/ECKeyPair.swift @@ -14,8 +14,8 @@ public extension ECKeyPair { // Check that it's a valid hexadecimal encoding let allowedCharacters = CharacterSet(charactersIn: "0123456789ABCDEF") guard candidate.uppercased().unicodeScalars.allSatisfy({ allowedCharacters.contains($0) }) else { return false } - // Check that it has either length 66 and a leading "05" or length 64 - guard (candidate.count == 66 && candidate.hasPrefix("05")) || candidate.count == 64 else { return false } + // Check that it has length 66 and a leading "05" + guard candidate.count == 66 && candidate.hasPrefix("05") else { return false } // It appears to be a valid public key return true }