From 9512cdf7bf626de04b937dc519b920eadac9851e Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Wed, 8 Dec 2021 21:13:03 +0000
Subject: [PATCH] Use accumulator vars for the baseFmt in auth/fmt.go

---
 auth/fmt.go | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/auth/fmt.go b/auth/fmt.go
index 06cf9cbc3..89c853bab 100644
--- a/auth/fmt.go
+++ b/auth/fmt.go
@@ -37,6 +37,8 @@ func newBaseFormat(payloadSize, pubkeySize, sidHPubkeySize int ) baseFormat {
 			total)
 	}
 
+	jww.INFO.Printf("Empty Space RequestAuth: %d", payloadSize-total)
+
 	f := buildBaseFormat(make([]byte, payloadSize), pubkeySize,
 		sidHPubkeySize)
 
@@ -48,10 +50,20 @@ func buildBaseFormat(data []byte, pubkeySize, sidHPubkeySize int) baseFormat {
 		data: data,
 	}
 
-	f.pubkey = f.data[:pubkeySize]
-	f.sidHpubkey = f.data[pubkeySize: pubkeySize + sidHPubkeySize + 1]
-	f.salt = f.data[pubkeySize + sidHPubkeySize: pubkeySize+sidHPubkeySize+saltSize]
-	f.ecrPayload = f.data[pubkeySize+sidHPubkeySize+saltSize:]
+	start := 0
+	end := pubkeySize
+	f.pubkey = f.data[:end]
+
+	start = end
+	end = start + sidHPubkeySize + 1
+	f.sidHpubkey = f.data[start:end]
+
+	start = end
+	end = start + saltSize
+	f.salt = f.data[start:end]
+
+	start = end
+	f.ecrPayload = f.data[start:]
 	return f
 }
 
-- 
GitLab