From: Jason A. Donenfeld <Jason@zx2c4.com>
Date: Fri, 15 Feb 2019 20:10:58 +0000 (+0100)
Subject: ConfTextStorage: lowercase only once
X-Git-Tag: 0.0.20190319-1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f7214ff383d336511df32543275fd94ec8e955c;p=thirdparty%2Fwireguard-apple.git

ConfTextStorage: lowercase only once

Also fix submodule regression.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---

diff --git a/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift b/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
index caa2bc4..077ee1e 100644
--- a/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
+++ b/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
@@ -100,14 +100,13 @@ class ConfTextStorage: NSTextStorage {
         resetLastPeer()
         while spans.pointee.type != HighlightEnd {
             let span = spans.pointee
-            var substring = backingStore.attributedSubstring(from: NSRange(location: span.start, length: span.len)).string
+            var substring = backingStore.attributedSubstring(from: NSRange(location: span.start, length: span.len)).string.lowercased()
 
             if span.type == HighlightError {
                 resetLastPeer()
                 return
-            }
-            if span.type == HighlightSection {
-                if substring.lowercased() == "[peer]" {
+            } else if span.type == HighlightSection {
+                if substring == "[peer]" {
                     if hasOnePeer {
                         resetLastPeer()
                         return
@@ -115,7 +114,7 @@ class ConfTextStorage: NSTextStorage {
                     hasOnePeer = true
                 }
             } else if span.type == HighlightField {
-                fieldType = FieldType(rawValue: substring.lowercased())
+                fieldType = FieldType(rawValue: substring)
             } else if span.type == HighlightIP && fieldType == .dns {
                 lastOnePeerDNSServers.append(substring)
             } else if span.type == HighlightIP && fieldType == .allowedips {
diff --git a/wireguard-go b/wireguard-go
index c4b43e3..f7170e5 160000
--- a/wireguard-go
+++ b/wireguard-go
@@ -1 +1 @@
-Subproject commit c4b43e35a772305858e610d879c2b9d47f4d9866
+Subproject commit f7170e5de2065f37bac647484b34711db4797394