Show public key on interface. Do not generate public key on peer on generate. Add public key copy buttons.

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

WireGuard/ViewControllers/TunnelConfigurationTableViewController.swift

@@ -150,18 +150,6 @@ extension TunnelConfigurationTableViewController: InterfaceTableViewCellDelegate
                 }
 
                 self.tunnel.interface?.privateKey = privateKey.base64EncodedString()
-
-                if let peers = self.tunnel.peers?.array as? [Peer] {
-                    peers.forEach {
-                        var publicKey = Data(count: 32)
-                        privateKey.withUnsafeBytes({ (privateKeyBytes) -> Void in
-                            publicKey.withUnsafeMutableBytes({ (mutableBytes) -> Void in
-                                curve25519_derive_public_key(mutableBytes, privateKeyBytes)
-                            })
-                        })
-                        $0.publicKey = publicKey.base64EncodedString()
-                    }
-                }
             }
         }
         self.tableView.reloadData()
@@ -178,17 +166,26 @@ class InterfaceTableViewCell: UITableViewCell {
             nameField.text = model.tunnel?.title
             addressesField.text = model.addresses
             privateKeyField.text = model.privateKey
+            publicKeyField.text = model.publicKey
+
             listenPortField.text = String(model.listenPort)
             dnsField.text = model.dns
             mtuField.text = String(model.mtu)
         }
     }
 
+    @IBAction func copyPublicKey(_ sender: Any) {
+        if let publicKey = model.publicKey {
+            UIPasteboard.general.string = publicKey
+        }
+    }
+
     weak var delegate: InterfaceTableViewCellDelegate?
 
     @IBOutlet weak var nameField: UITextField!
     @IBOutlet weak var addressesField: UITextField!
     @IBOutlet weak var privateKeyField: UITextField!
+    @IBOutlet weak var publicKeyField: UILabel!
     @IBOutlet weak var listenPortField: UITextField!
     @IBOutlet weak var dnsField: UITextField!
     @IBOutlet weak var mtuField: UITextField!
@@ -208,6 +205,7 @@ extension InterfaceTableViewCell: UITextFieldDelegate {
             model.tunnel?.title = string
         } else if sender == privateKeyField {
             model.privateKey = string
+            publicKeyField.text = model.publicKey
         } else if sender == addressesField {
             model.addresses = string
         } else if sender == listenPortField {
@@ -246,6 +244,12 @@ class PeerTableViewCell: UITableViewCell {
     @IBOutlet weak var endpointField: UITextField!
     @IBOutlet weak var persistentKeepaliveField: UITextField!
 
+    @IBAction func copyPublicKey(_ sender: Any) {
+        if let publicKey = peer.publicKey {
+            UIPasteboard.general.string = publicKey
+        }
+    }
+
     @IBAction func deletePeer(_ sender: Any) {
         delegate?.delete(peer: peer)
     }

WireGuard/ViewControllers/TunnelInfoTableViewController.swift

@@ -73,37 +73,39 @@ class InterfaceInfoTableViewCell: UITableViewCell {
         didSet {
             nameField.text = model.tunnel?.title
             addressesField.text = model.addresses
-            privateKeyField.text = model.privateKey
-            listenPortField.text = String(model.listenPort)
-            dnsField.text = model.dns
-            mtuField.text = String(model.mtu)
+            publicKeyField.text = model.publicKey
         }
     }
 
     @IBOutlet weak var nameField: UILabel!
     @IBOutlet weak var addressesField: UILabel!
-    @IBOutlet weak var privateKeyField: UILabel!
-    @IBOutlet weak var listenPortField: UILabel!
-    @IBOutlet weak var dnsField: UILabel!
-    @IBOutlet weak var mtuField: UILabel!
+    @IBOutlet weak var publicKeyField: UILabel!
+
+    @IBAction func copyPublicKey(_ sender: Any) {
+        if let publicKey = model.publicKey {
+            UIPasteboard.general.string = publicKey
+        }
+    }
 }
 
 class PeerInfoTableViewCell: UITableViewCell {
     var peer: Peer! {
         didSet {
             publicKeyField.text = peer.publicKey
-            preSharedKeyField.text = peer.presharedKey
             allowedIpsField.text = peer.allowedIPs
             endpointField.text = peer.endpoint
-            persistentKeepaliveField.text = String(peer.persistentKeepalive)
         }
     }
 
     @IBOutlet weak var publicKeyField: UILabel!
-    @IBOutlet weak var preSharedKeyField: UILabel!
     @IBOutlet weak var allowedIpsField: UILabel!
     @IBOutlet weak var endpointField: UILabel!
-    @IBOutlet weak var persistentKeepaliveField: UILabel!
+
+    @IBAction func copyPublicKey(_ sender: Any) {
+        if let publicKey = peer.publicKey {
+            UIPasteboard.general.string = publicKey
+        }
+    }
 }
 
 extension TunnelInfoTableViewController: Identifyable {}