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/WireGuard/Crypto/Curve25519.swift | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'WireGuard/WireGuard/Crypto') diff --git a/WireGuard/WireGuard/Crypto/Curve25519.swift b/WireGuard/WireGuard/Crypto/Curve25519.swift index 84c35d3..43d9b00 100644 --- a/WireGuard/WireGuard/Crypto/Curve25519.swift +++ b/WireGuard/WireGuard/Crypto/Curve25519.swift @@ -4,24 +4,27 @@ import UIKit struct Curve25519 { + + static let keyLength: Int = 32 + static func generatePrivateKey() -> Data { - var privateKey = Data(repeating: 0, count: 32) + var privateKey = Data(repeating: 0, count: TunnelConfiguration.keyLength) privateKey.withUnsafeMutableBytes { (bytes: UnsafeMutablePointer) in curve25519_generate_private_key(bytes) } - assert(privateKey.count == 32) + assert(privateKey.count == TunnelConfiguration.keyLength) return privateKey } static func generatePublicKey(fromPrivateKey privateKey: Data) -> Data { - assert(privateKey.count == 32) - var publicKey = Data(repeating: 0, count: 32) + assert(privateKey.count == TunnelConfiguration.keyLength) + var publicKey = Data(repeating: 0, count: TunnelConfiguration.keyLength) privateKey.withUnsafeBytes { (privateKeyBytes: UnsafePointer) in publicKey.withUnsafeMutableBytes { (bytes: UnsafeMutablePointer) in curve25519_derive_public_key(bytes, privateKeyBytes) } } - assert(publicKey.count == 32) + assert(publicKey.count == TunnelConfiguration.keyLength) return publicKey } } -- cgit v1.2.3-59-g8ed1b