From 60e13ddbf6e0d9fc03b57806043dbf0266a8cf70 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Sat, 8 Dec 2018 18:52:11 +0530 Subject: Model: Declare keyLength constant and use that wherever applicable Signed-off-by: Roopesh Chander --- WireGuard/Shared/Model/Configuration.swift | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'WireGuard/Shared/Model') diff --git a/WireGuard/Shared/Model/Configuration.swift b/WireGuard/Shared/Model/Configuration.swift index 41ff7bc..d2680cb 100644 --- a/WireGuard/Shared/Model/Configuration.swift +++ b/WireGuard/Shared/Model/Configuration.swift @@ -7,6 +7,9 @@ import Foundation final class TunnelConfiguration: Codable { var interface: InterfaceConfiguration let peers: [PeerConfiguration] + + static let keyLength: Int = 32 + init(interface: InterfaceConfiguration, peers: [PeerConfiguration]) { self.interface = interface self.peers = peers @@ -32,7 +35,7 @@ struct InterfaceConfiguration: Codable { self.name = name self.privateKey = privateKey if (name.isEmpty) { fatalError("Empty name") } - if (privateKey.count != 32) { fatalError("Invalid private key") } + if (privateKey.count != TunnelConfiguration.keyLength) { fatalError("Invalid private key") } } } @@ -42,7 +45,7 @@ struct PeerConfiguration: Codable { var preSharedKey: Data? { didSet(value) { if let value = value { - if (value.count != 32) { fatalError("Invalid preshared key") } + if (value.count != TunnelConfiguration.keyLength) { fatalError("Invalid preshared key") } } } } @@ -52,6 +55,6 @@ struct PeerConfiguration: Codable { init(publicKey: Data) { self.publicKey = publicKey - if (publicKey.count != 32) { fatalError("Invalid public key") } + if (publicKey.count != TunnelConfiguration.keyLength) { fatalError("Invalid public key") } } } -- cgit v1.2.3-59-g8ed1b