From bde5860b4720de21a3b6cfcc064d560d45d3c846 Mon Sep 17 00:00:00 2001
From: Captain ALM <captainalm@captainalm.com>
Date: Mon, 22 May 2023 13:30:45 +0100
Subject: [PATCH] Add the ability to set secret sending for
 NetworkEncryptionUpgradePackets on or off.

---
 .../core/NetworkEncryptionUpgradePacket.java  | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/com/captainalm/lib/calmnet/packet/core/NetworkEncryptionUpgradePacket.java b/src/com/captainalm/lib/calmnet/packet/core/NetworkEncryptionUpgradePacket.java
index d4d1b16..3b27487 100644
--- a/src/com/captainalm/lib/calmnet/packet/core/NetworkEncryptionUpgradePacket.java
+++ b/src/com/captainalm/lib/calmnet/packet/core/NetworkEncryptionUpgradePacket.java
@@ -24,6 +24,7 @@ public class NetworkEncryptionUpgradePacket implements IPacket, IAcknowledgement
     protected boolean upgrade;
     protected boolean base64ed;
     protected ICipherFactory cipherFactory;
+    protected boolean sendSecrets;
 
     protected final Object slock = new Object();
 
@@ -82,7 +83,7 @@ public class NetworkEncryptionUpgradePacket implements IPacket, IAcknowledgement
         synchronized (slock) {
             if (acknowledgement == null) throw new PacketException("no data");
 
-            byte[] cipherBytes = (cipherFactory == null) ? null : cipherFactory.getSettings();
+            byte[] cipherBytes = (cipherFactory == null) ? null : (sendSecrets) ? cipherFactory.getSettings() : cipherFactory.getSettingsNoSecrets();
             byte[] toret = new byte[2 + ((cipherBytes == null) ? 0 : cipherBytes.length)];
             toret[0] = (acknowledgement) ? (byte) 1 : (byte) 0;
             toret[1] = (byte) (((upgrade) ? 1 : 0) + ((base64ed) ? 2 : 0));
@@ -98,7 +99,7 @@ public class NetworkEncryptionUpgradePacket implements IPacket, IAcknowledgement
      *
      * @param packetData The packet payload data.
      * @throws NullPointerException The new store data is null.
-     * @throws PacketException      An Exception has occurred.
+     * @throws PacketException An Exception has occurred.
      */
     @Override
     public void loadPayload(byte[] packetData) throws PacketException {
@@ -196,4 +197,24 @@ public class NetworkEncryptionUpgradePacket implements IPacket, IAcknowledgement
     public boolean isAcknowledgement() {
         return (acknowledgement != null && acknowledgement);
     }
+
+    /**
+     * Gets if secrets are sent as part of cipher settings.
+     *
+     * @return If the secrets are part of the cipher settings.
+     */
+    public boolean areSecretsSent() {
+        return sendSecrets;
+    }
+
+    /**
+     * Sets if secrets should be sent as part of cipher settings.
+     *
+     * @param sendSecrets If secrets are part of the cipher settings.
+     */
+    public void setIfSecretsSent(boolean sendSecrets) {
+        synchronized (slock) {
+            this.sendSecrets = sendSecrets;
+        }
+    }
 }